From 08176389afe32268a8f3e064524fe7b3ae854636 Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Thu, 7 Feb 2013 03:27:12 -0800
Subject: [PATCH 01/13] Fixed warning "unix_event_emitter.cpp:569:8: warning:
 'KeySym XKeycodeToKeysym(Display*, KeyCode, int)' is deprecated (declared at
 /usr/include/X11/Xlib.h:1695)"

---
 code/nel/src/3d/driver/opengl/unix_event_emitter.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index c59167183..09f940456 100644
--- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -566,7 +566,8 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
 		}
 		else
 		{
-			k = XKeycodeToKeysym(_dpy, keyCode, 0);
+			int keysyms_per_keycode_return;
+			k = (KeySym)XGetKeyboardMapping(_dpy,keyCode,0,&keysyms_per_keycode_return);
 		}
 
 		// send CEventKeyDown event only if keyCode is defined

From cd9f2aa23874c60e52e2bf81c5591001847a84e4 Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Thu, 7 Feb 2013 12:19:00 -0800
Subject: [PATCH 02/13] Fixed warning: multi-character character constant
 [-Wmultichar]

---
 code/nel/include/nel/georges/load_form.h      |  2 +-
 code/nel/src/3d/animation.cpp                 |  4 +-
 code/nel/src/3d/animation_set.cpp             |  6 +-
 code/nel/src/3d/lod_character_shape.cpp       | 12 +--
 code/nel/src/3d/packed_world.cpp              |  2 +-
 code/nel/src/3d/ps_located.cpp                |  2 +-
 code/nel/src/3d/scene_group.cpp               |  2 +-
 code/nel/src/3d/shape.cpp                     |  2 +-
 code/nel/src/3d/skeleton_weight.cpp           |  2 +-
 code/nel/src/3d/tile_far_bank.cpp             |  4 +-
 code/nel/src/3d/vegetable_shape.cpp           |  8 +-
 code/nel/src/3d/vertex_program_parse.cpp      | 98 +++++++++----------
 code/nel/src/3d/zone.cpp                      |  2 +-
 code/nel/src/ligo/ligo_material.cpp           |  2 +-
 code/nel/src/ligo/transition.cpp              |  2 +-
 code/nel/src/ligo/zone_region.cpp             |  2 +-
 code/nel/src/pacs/primitive_block_pacs.cpp    |  2 +-
 code/ryzom/client/src/character_cl.cpp        |  2 +-
 code/ryzom/client/src/string_manager_client.h |  4 +-
 19 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/code/nel/include/nel/georges/load_form.h b/code/nel/include/nel/georges/load_form.h
index 6bf6c83c3..df4f93fb9 100644
--- a/code/nel/include/nel/georges/load_form.h
+++ b/code/nel/include/nel/georges/load_form.h
@@ -109,7 +109,7 @@ struct TLoadFormDicoEntry
 	}
 };
 */
-const uint32		PACKED_SHEET_HEADER = 'PKSH';
+const uint32		PACKED_SHEET_HEADER = "PKSH";
 const uint32		PACKED_SHEET_VERSION = 5;
 // This Version may be used if you want to use the serialVersion() system in loadForm()
 const uint32		PACKED_SHEET_VERSION_COMPATIBLE = 0;
diff --git a/code/nel/src/3d/animation.cpp b/code/nel/src/3d/animation.cpp
index 9cfd3f26b..8cd51cc46 100644
--- a/code/nel/src/3d/animation.cpp
+++ b/code/nel/src/3d/animation.cpp
@@ -89,8 +89,8 @@ void CAnimation::serial (NLMISC::IStream& f)
 	nlassert(_IdByChannelId.empty());
 
 	// Serial a header
-	f.serialCheck ((uint32)'_LEN');
-	f.serialCheck ((uint32)'MINA');
+	f.serialCheck ((uint32)"_LEN");
+	f.serialCheck ((uint32)"MINA");
 
 	// Serial a version
 	sint version=f.serialVersion (2);
diff --git a/code/nel/src/3d/animation_set.cpp b/code/nel/src/3d/animation_set.cpp
index 94946799b..79f59b565 100644
--- a/code/nel/src/3d/animation_set.cpp
+++ b/code/nel/src/3d/animation_set.cpp
@@ -185,9 +185,9 @@ void CAnimationSet::serial (NLMISC::IStream& f)
 	nlassert(!_AnimHeaderOptimisation);
 
 	// Serial an header
-	f.serialCheck ((uint32)'_LEN');
-	f.serialCheck ((uint32)'MINA');
-	f.serialCheck ((uint32)'TES_');
+	f.serialCheck ((uint32)"_LEN");
+	f.serialCheck ((uint32)"MINA");
+	f.serialCheck ((uint32)"TES_");
 
 	// Serial a version
 	uint	ver= f.serialVersion (1);
diff --git a/code/nel/src/3d/lod_character_shape.cpp b/code/nel/src/3d/lod_character_shape.cpp
index 09aded766..24e87baa8 100644
--- a/code/nel/src/3d/lod_character_shape.cpp
+++ b/code/nel/src/3d/lod_character_shape.cpp
@@ -264,9 +264,9 @@ void	CLodCharacterShapeBuild::compile(const std::vector<bool> &triangleSelection
 void	CLodCharacterShapeBuild::serial(NLMISC::IStream &f)
 {
 	// NEL_CLODBULD
-	f.serialCheck((uint32)'_LEN');
-	f.serialCheck((uint32)'DOLC');
-	f.serialCheck((uint32)'DLUB');
+	f.serialCheck((uint32)"_LEN");
+	f.serialCheck((uint32)"DOLC");
+	f.serialCheck((uint32)"DLUB");
 
 	/*
 	Version 1:
@@ -525,9 +525,9 @@ void			CLodCharacterShape::CBoneInfluence::serial(NLMISC::IStream &f)
 void			CLodCharacterShape::serial(NLMISC::IStream &f)
 {
 	// NEL_CLODSHAP
-	f.serialCheck((uint32)'_LEN');
-	f.serialCheck((uint32)'DOLC');
-	f.serialCheck((uint32)'PAHS');
+	f.serialCheck((uint32)"_LEN");
+	f.serialCheck((uint32)"DOLC");
+	f.serialCheck((uint32)"PAHS");
 
 	/*
 	Version 1:
diff --git a/code/nel/src/3d/packed_world.cpp b/code/nel/src/3d/packed_world.cpp
index 64b669fc4..db86191b4 100644
--- a/code/nel/src/3d/packed_world.cpp
+++ b/code/nel/src/3d/packed_world.cpp
@@ -152,7 +152,7 @@ void CPackedWorld::getZones(std::vector<TPackedZoneBaseSPtr> &zones)
 void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream)
 {
 	f.serialVersion(1);
-	f.serialCheck((uint32) 'OWPA');
+	f.serialCheck((uint32) "OWPA");
 	f.serialCont(ZoneNames);
 }
 
diff --git a/code/nel/src/3d/ps_located.cpp b/code/nel/src/3d/ps_located.cpp
index f066b6f3c..668db58a1 100644
--- a/code/nel/src/3d/ps_located.cpp
+++ b/code/nel/src/3d/ps_located.cpp
@@ -73,7 +73,7 @@ CPSLocated::CPSLocated() : /*_MaxNumFaces(0),*/
 						   _ParametricMotion(false),
 						   _TriggerOnDeath(false),
 						   _LastForever(true),
-						   _TriggerID((uint32) 'NONE'),
+						   _TriggerID((uint32) "NONE"),
 						   _NonIntegrableForceNbRefs(0),
 						   _NumIntegrableForceWithDifferentBasis(0)
 {
diff --git a/code/nel/src/3d/scene_group.cpp b/code/nel/src/3d/scene_group.cpp
index 7cfa56b02..e9f98ab04 100644
--- a/code/nel/src/3d/scene_group.cpp
+++ b/code/nel/src/3d/scene_group.cpp
@@ -405,7 +405,7 @@ void CInstanceGroup::serial (NLMISC::IStream& f)
 	 * ***********************************************/
 
 	// Serial a header
-	f.serialCheck ((uint32)'TPRG');
+	f.serialCheck ((uint32)"TPRG");
 
 	/*
 	Version 5:
diff --git a/code/nel/src/3d/shape.cpp b/code/nel/src/3d/shape.cpp
index adc610827..dbb099b64 100644
--- a/code/nel/src/3d/shape.cpp
+++ b/code/nel/src/3d/shape.cpp
@@ -116,7 +116,7 @@ IShape*	CShapeStream::getShapePointer () const
 void CShapeStream::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 {
 	// First, serial an header or checking if it is correct
-	f.serialCheck ((uint32)'PAHS');
+	f.serialCheck ((uint32)"PAHS");
 
 	// Then, serial the shape
 	f.serialPolyPtr (_Shape);
diff --git a/code/nel/src/3d/skeleton_weight.cpp b/code/nel/src/3d/skeleton_weight.cpp
index 4668a005a..e5962b66d 100644
--- a/code/nel/src/3d/skeleton_weight.cpp
+++ b/code/nel/src/3d/skeleton_weight.cpp
@@ -60,7 +60,7 @@ void CSkeletonWeight::build (const TNodeArray& array)
 void CSkeletonWeight::serial (NLMISC::IStream& f)
 {
 	// Serial a header
-	f.serialCheck ((uint32)'TWKS');
+	f.serialCheck ((uint32)"TWKS");
 
 	// Serial a version number
 	(void)f.serialVersion (0);
diff --git a/code/nel/src/3d/tile_far_bank.cpp b/code/nel/src/3d/tile_far_bank.cpp
index 75a758560..4aa95f872 100644
--- a/code/nel/src/3d/tile_far_bank.cpp
+++ b/code/nel/src/3d/tile_far_bank.cpp
@@ -104,8 +104,8 @@ const sint CTileFarBank::_Version=0x0;
 void CTileFarBank::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 {
 	// Write/Check "FAR_BANK" in header of the stream
-	f.serialCheck ((uint32)'_RAF');
-	f.serialCheck ((uint32)'KNAB');
+	f.serialCheck ((uint32)"_RAF");
+	f.serialCheck ((uint32)"KNAB");
 
 	// Serial version
 	(void)f.serialVersion(_Version);
diff --git a/code/nel/src/3d/vegetable_shape.cpp b/code/nel/src/3d/vegetable_shape.cpp
index 0b8697d63..f10591bf9 100644
--- a/code/nel/src/3d/vegetable_shape.cpp
+++ b/code/nel/src/3d/vegetable_shape.cpp
@@ -192,10 +192,10 @@ void		CVegetableShape::serial(NLMISC::IStream &f)
 		- BestSidedPreComputeLighting
 	*/
 	sint	ver= f.serialVersion(1);
-	f.serialCheck((uint32)'_LEN');
-	f.serialCheck((uint32)'GEV_');
-	f.serialCheck((uint32)'BATE');
-	f.serialCheck((uint32)'__EL');
+	f.serialCheck((uint32)"_LEN");
+	f.serialCheck((uint32)"GEV_");
+	f.serialCheck((uint32)"BATE");
+	f.serialCheck((uint32)"__EL");
 
 	f.serial(Lighted);
 	f.serial(DoubleSided);
diff --git a/code/nel/src/3d/vertex_program_parse.cpp b/code/nel/src/3d/vertex_program_parse.cpp
index 25ed6e9f4..4ac59e097 100644
--- a/code/nel/src/3d/vertex_program_parse.cpp
+++ b/code/nel/src/3d/vertex_program_parse.cpp
@@ -258,21 +258,21 @@ bool CVPParser::parseInputRegister(CVPOperand &operand, std::string &errorOutput
 		}
 		switch (strValue)
 		{
-			case 'OPOS': operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
-			case 'WGHT': operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
-			case 'NRML': operand.Value.InputRegisterValue = CVPOperand::INormal; break;
-			case 'COL0': operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
-			case 'COL1': operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
-			case 'FOGC': operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
+			case "OPOS": operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
+			case "WGHT": operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
+			case "NRML": operand.Value.InputRegisterValue = CVPOperand::INormal; break;
+			case "COL0": operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
+			case "COL1": operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
+			case "FOGC": operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
 			// texture argument
-			case 'TEX0':
-			case 'TEX1':
-			case 'TEX2':
-			case 'TEX3':
-			case 'TEX4':
-			case 'TEX5':
-			case 'TEX6':
-			case 'TEX7':
+			case "TEX0":
+			case "TEX1":
+			case "TEX2":
+			case "TEX3":
+			case "TEX4":
+			case "TEX5":
+			case "TEX6":
+			case "TEX7":
 				operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0');
 			break;
 			default:
@@ -386,21 +386,21 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
 	// convert to enum
 	switch(strValue)
 	{
-		case 'HPOS': operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
-		case 'COL0': operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
-		case 'COL1': operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
-		case 'BFC0': operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
-		case 'BFC1': operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
-		case 'FOGC': operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
-		case 'PSIZ': operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
-		case 'TEX0': operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
-		case 'TEX1': operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
-		case 'TEX2': operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
-		case 'TEX3': operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
-		case 'TEX4': operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
-		case 'TEX5': operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
-		case 'TEX6': operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
-		case 'TEX7': operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
+		case "HPOS": operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
+		case "COL0": operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
+		case "COL1": operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
+		case "BFC0": operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
+		case "BFC1": operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
+		case "FOGC": operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
+		case "PSIZ": operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
+		case "TEX0": operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
+		case "TEX1": operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
+		case "TEX2": operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
+		case "TEX3": operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
+		case "TEX4": operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
+		case "TEX5": operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
+		case "TEX6": operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
+		case "TEX7": operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
 		default:
 			errorOutput = "Can't read index for output register.";
 			return false;
@@ -755,7 +755,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	}
 	switch (instrStr)
 	{
-		case 'ARL ':
+		case "ARL ":
 			instr.Opcode = CVPInstruction::ARL;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -764,7 +764,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case 'RSQ ':
+		case "RSQ ":
 			instr.Opcode = CVPInstruction::RSQ;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -773,8 +773,8 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case 'EXP ':
-		case 'EXPP':
+		case "EXP ":
+		case "EXPP":
 			instr.Opcode = CVPInstruction::EXPP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -789,7 +789,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}*/
 		break;
-		case 'LOG ':
+		case "LOG ":
 			instr.Opcode = CVPInstruction::LOG;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -805,7 +805,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 			*/
 		break;
-		case 'RCP ':
+		case "RCP ":
 			instr.Opcode = CVPInstruction::RCP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -815,60 +815,60 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 		break;
 		/////////////////
-		case 'MOV ':
+		case "MOV ":
 			instr.Opcode = CVPInstruction::MOV;
 			if (!parseOp2(instr, errorOutput)) return false;
 
 		break;
-		case 'LIT ':
+		case "LIT ":
 			instr.Opcode = CVPInstruction::LIT;
 			if (!parseOp2(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'MAD ':
+		case "MAD ":
 			instr.Opcode = CVPInstruction::MAD;
 			if (!parseOp4(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'ADD ':
+		case "ADD ":
 			instr.Opcode = CVPInstruction::ADD;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'MUL ':
+		case "MUL ":
 			instr.Opcode = CVPInstruction::MUL;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DP3 ':
+		case "DP3 ":
 			instr.Opcode = CVPInstruction::DP3;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DP4 ':
+		case "DP4 ":
 			instr.Opcode = CVPInstruction::DP4;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DST ':
+		case "DST ":
 			instr.Opcode = CVPInstruction::DST;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'MIN ':
+		case "MIN ":
 			instr.Opcode = CVPInstruction::MIN;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'MAX ':
+		case "MAX ":
 			instr.Opcode = CVPInstruction::MAX;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'SLT ':
+		case "SLT ":
 			instr.Opcode = CVPInstruction::SLT;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'SGE ':
+		case "SGE ":
 			instr.Opcode = CVPInstruction::SGE;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'END ':
+		case "END ":
 			endEncountered = true;
 			return true;
 		break;
@@ -885,7 +885,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	}
 
 	// it is not allowed to write to an adress register except for ARL
-	if (instrStr != 'ARL ')
+	if (instrStr != "ARL ")
 	{
 		if (instr.Dest.Type == CVPOperand::AddressRegister)
 		{
diff --git a/code/nel/src/3d/zone.cpp b/code/nel/src/3d/zone.cpp
index 4acca80f5..5b923af56 100644
--- a/code/nel/src/3d/zone.cpp
+++ b/code/nel/src/3d/zone.cpp
@@ -458,7 +458,7 @@ void			CZone::serial(NLMISC::IStream &f)
 		throw EOlderStream(f);
 	}
 
-	f.serialCheck((uint32)'ENOZ');
+	f.serialCheck((uint32)"ENOZ");
 
 	f.xmlSerial (ZoneId, "ZONE_ID");
 	f.xmlSerial (ZoneBB, "BB");
diff --git a/code/nel/src/ligo/ligo_material.cpp b/code/nel/src/ligo/ligo_material.cpp
index 643629648..a51dd3171 100644
--- a/code/nel/src/ligo/ligo_material.cpp
+++ b/code/nel/src/ligo/ligo_material.cpp
@@ -80,7 +80,7 @@ void CMaterial::serial (NLMISC::IStream &s)
 	s.xmlPush ("LIGO_MATERIAL");
 
 		// Serial the header
-		s.serialCheck ((uint32)'TMOL');
+		s.serialCheck ((uint32)"TMOL");
 
 		// Serial the version
 		/*sint ver =*/ s.serialVersion (0);
diff --git a/code/nel/src/ligo/transition.cpp b/code/nel/src/ligo/transition.cpp
index b13c4f566..4b90c9078 100644
--- a/code/nel/src/ligo/transition.cpp
+++ b/code/nel/src/ligo/transition.cpp
@@ -199,7 +199,7 @@ void CTransition::serial (NLMISC::IStream &s)
 	s.xmlPush ("LIGO_TRANSITION");
 
 		// Serial the header
-		s.serialCheck ((uint32)'STGL');
+		s.serialCheck ((uint32)"STGL");
 
 		// Serial the version
 		/*sint ver =*/ s.serialVersion (0);
diff --git a/code/nel/src/ligo/zone_region.cpp b/code/nel/src/ligo/zone_region.cpp
index ad65aec8e..71f4c06c2 100644
--- a/code/nel/src/ligo/zone_region.cpp
+++ b/code/nel/src/ligo/zone_region.cpp
@@ -153,7 +153,7 @@ void CZoneRegion::serial (NLMISC::IStream &f)
 	f.xmlPush ("LAND");
 
 		sint32 version = f.serialVersion (1);
-		f.serialCheck ((uint32)'DNAL');
+		f.serialCheck ((uint32)"DNAL");
 
 		f.xmlSerial (_MinX, "MIN_X");
 		f.xmlSerial (_MinY, "MIN_Y");
diff --git a/code/nel/src/pacs/primitive_block_pacs.cpp b/code/nel/src/pacs/primitive_block_pacs.cpp
index 0681d2eea..14dd2764b 100644
--- a/code/nel/src/pacs/primitive_block_pacs.cpp
+++ b/code/nel/src/pacs/primitive_block_pacs.cpp
@@ -85,7 +85,7 @@ void CPrimitiveBlock::serial (NLMISC::IStream &s)
 	s.xmlPush ("PRIMITIVE_BLOCK");
 
 	// Serial checks
-	s.serialCheck ((uint32)'KBRP');
+	s.serialCheck ((uint32)"KBRP");
 
 	// Serial the version
 	(void)s.serialVersion (0);
diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp
index 2f947e198..52bf10cd5 100644
--- a/code/ryzom/client/src/character_cl.cpp
+++ b/code/ryzom/client/src/character_cl.cpp
@@ -488,7 +488,7 @@ void CCharacterCL::stopAttachedFXForCurrrentAnim(bool stopLoopingFX)
 			{
 				if(!(*tmpItAttached)->FX.empty())
 				{
-					if (!(*tmpItAttached)->FX.removeByID('STOP') && !(*tmpItAttached)->FX.removeByID('main'))
+					if (!(*tmpItAttached)->FX.removeByID("STOP") && !(*tmpItAttached)->FX.removeByID("main"))
 					{
 						(*tmpItAttached)->FX.activateEmitters(false);
 					}
diff --git a/code/ryzom/client/src/string_manager_client.h b/code/ryzom/client/src/string_manager_client.h
index 89e05acd0..7be20d5bb 100644
--- a/code/ryzom/client/src/string_manager_client.h
+++ b/code/ryzom/client/src/string_manager_client.h
@@ -341,8 +341,8 @@ private:
 
 		void	serial(NLMISC::IStream &f)
 		{
-			f.serialCheck((uint32)'_RTS');
-			f.serialCheck((uint32)'KCAP');
+			f.serialCheck((uint32)"_RTS");
+			f.serialCheck((uint32)"KCAP");
 			f.serialVersion(0);
 			f.serial(PackedVersion);
 			f.serial(LanguageCode);

From 6f72f2fb3e6bf5c234b001a15d8c24b89b6cb23d Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Thu, 7 Feb 2013 13:00:51 -0800
Subject: [PATCH 03/13] fixed vertex_program_parse

---
 code/nel/src/3d/vertex_program_parse.cpp | 98 ++++++++++++------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/code/nel/src/3d/vertex_program_parse.cpp b/code/nel/src/3d/vertex_program_parse.cpp
index 4ac59e097..25ed6e9f4 100644
--- a/code/nel/src/3d/vertex_program_parse.cpp
+++ b/code/nel/src/3d/vertex_program_parse.cpp
@@ -258,21 +258,21 @@ bool CVPParser::parseInputRegister(CVPOperand &operand, std::string &errorOutput
 		}
 		switch (strValue)
 		{
-			case "OPOS": operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
-			case "WGHT": operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
-			case "NRML": operand.Value.InputRegisterValue = CVPOperand::INormal; break;
-			case "COL0": operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
-			case "COL1": operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
-			case "FOGC": operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
+			case 'OPOS': operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
+			case 'WGHT': operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
+			case 'NRML': operand.Value.InputRegisterValue = CVPOperand::INormal; break;
+			case 'COL0': operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
+			case 'COL1': operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
+			case 'FOGC': operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
 			// texture argument
-			case "TEX0":
-			case "TEX1":
-			case "TEX2":
-			case "TEX3":
-			case "TEX4":
-			case "TEX5":
-			case "TEX6":
-			case "TEX7":
+			case 'TEX0':
+			case 'TEX1':
+			case 'TEX2':
+			case 'TEX3':
+			case 'TEX4':
+			case 'TEX5':
+			case 'TEX6':
+			case 'TEX7':
 				operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0');
 			break;
 			default:
@@ -386,21 +386,21 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
 	// convert to enum
 	switch(strValue)
 	{
-		case "HPOS": operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
-		case "COL0": operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
-		case "COL1": operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
-		case "BFC0": operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
-		case "BFC1": operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
-		case "FOGC": operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
-		case "PSIZ": operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
-		case "TEX0": operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
-		case "TEX1": operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
-		case "TEX2": operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
-		case "TEX3": operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
-		case "TEX4": operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
-		case "TEX5": operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
-		case "TEX6": operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
-		case "TEX7": operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
+		case 'HPOS': operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
+		case 'COL0': operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
+		case 'COL1': operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
+		case 'BFC0': operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
+		case 'BFC1': operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
+		case 'FOGC': operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
+		case 'PSIZ': operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
+		case 'TEX0': operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
+		case 'TEX1': operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
+		case 'TEX2': operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
+		case 'TEX3': operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
+		case 'TEX4': operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
+		case 'TEX5': operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
+		case 'TEX6': operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
+		case 'TEX7': operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
 		default:
 			errorOutput = "Can't read index for output register.";
 			return false;
@@ -755,7 +755,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	}
 	switch (instrStr)
 	{
-		case "ARL ":
+		case 'ARL ':
 			instr.Opcode = CVPInstruction::ARL;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -764,7 +764,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case "RSQ ":
+		case 'RSQ ':
 			instr.Opcode = CVPInstruction::RSQ;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -773,8 +773,8 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case "EXP ":
-		case "EXPP":
+		case 'EXP ':
+		case 'EXPP':
 			instr.Opcode = CVPInstruction::EXPP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -789,7 +789,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}*/
 		break;
-		case "LOG ":
+		case 'LOG ':
 			instr.Opcode = CVPInstruction::LOG;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -805,7 +805,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 			*/
 		break;
-		case "RCP ":
+		case 'RCP ':
 			instr.Opcode = CVPInstruction::RCP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -815,60 +815,60 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 		break;
 		/////////////////
-		case "MOV ":
+		case 'MOV ':
 			instr.Opcode = CVPInstruction::MOV;
 			if (!parseOp2(instr, errorOutput)) return false;
 
 		break;
-		case "LIT ":
+		case 'LIT ':
 			instr.Opcode = CVPInstruction::LIT;
 			if (!parseOp2(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case "MAD ":
+		case 'MAD ':
 			instr.Opcode = CVPInstruction::MAD;
 			if (!parseOp4(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case "ADD ":
+		case 'ADD ':
 			instr.Opcode = CVPInstruction::ADD;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case "MUL ":
+		case 'MUL ':
 			instr.Opcode = CVPInstruction::MUL;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "DP3 ":
+		case 'DP3 ':
 			instr.Opcode = CVPInstruction::DP3;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "DP4 ":
+		case 'DP4 ':
 			instr.Opcode = CVPInstruction::DP4;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "DST ":
+		case 'DST ':
 			instr.Opcode = CVPInstruction::DST;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "MIN ":
+		case 'MIN ':
 			instr.Opcode = CVPInstruction::MIN;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "MAX ":
+		case 'MAX ':
 			instr.Opcode = CVPInstruction::MAX;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "SLT ":
+		case 'SLT ':
 			instr.Opcode = CVPInstruction::SLT;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "SGE ":
+		case 'SGE ':
 			instr.Opcode = CVPInstruction::SGE;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case "END ":
+		case 'END ':
 			endEncountered = true;
 			return true;
 		break;
@@ -885,7 +885,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	}
 
 	// it is not allowed to write to an adress register except for ARL
-	if (instrStr != "ARL ")
+	if (instrStr != 'ARL ')
 	{
 		if (instr.Dest.Type == CVPOperand::AddressRegister)
 		{

From cad71e15519619252704bcd14776de3fd986778f Mon Sep 17 00:00:00 2001
From: Botanic <admin@tempestintheaether.org>
Date: Thu, 7 Feb 2013 15:04:28 -0800
Subject: [PATCH 04/13] fixed load form and character_cl

---
 code/nel/include/nel/georges/load_form.h | 2 +-
 code/ryzom/client/src/character_cl.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/nel/include/nel/georges/load_form.h b/code/nel/include/nel/georges/load_form.h
index df4f93fb9..6bf6c83c3 100644
--- a/code/nel/include/nel/georges/load_form.h
+++ b/code/nel/include/nel/georges/load_form.h
@@ -109,7 +109,7 @@ struct TLoadFormDicoEntry
 	}
 };
 */
-const uint32		PACKED_SHEET_HEADER = "PKSH";
+const uint32		PACKED_SHEET_HEADER = 'PKSH';
 const uint32		PACKED_SHEET_VERSION = 5;
 // This Version may be used if you want to use the serialVersion() system in loadForm()
 const uint32		PACKED_SHEET_VERSION_COMPATIBLE = 0;
diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp
index 52bf10cd5..2f947e198 100644
--- a/code/ryzom/client/src/character_cl.cpp
+++ b/code/ryzom/client/src/character_cl.cpp
@@ -488,7 +488,7 @@ void CCharacterCL::stopAttachedFXForCurrrentAnim(bool stopLoopingFX)
 			{
 				if(!(*tmpItAttached)->FX.empty())
 				{
-					if (!(*tmpItAttached)->FX.removeByID("STOP") && !(*tmpItAttached)->FX.removeByID("main"))
+					if (!(*tmpItAttached)->FX.removeByID('STOP') && !(*tmpItAttached)->FX.removeByID('main'))
 					{
 						(*tmpItAttached)->FX.activateEmitters(false);
 					}

From 2067d66b1572fd7b31be26dad3289152831790d4 Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Fri, 8 Feb 2013 03:08:24 -0800
Subject: [PATCH 05/13] Backed out changeset: c569b6062f5d

---
 code/nel/src/3d/driver/opengl/unix_event_emitter.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index 09f940456..c59167183 100644
--- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -566,8 +566,7 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
 		}
 		else
 		{
-			int keysyms_per_keycode_return;
-			k = (KeySym)XGetKeyboardMapping(_dpy,keyCode,0,&keysyms_per_keycode_return);
+			k = XKeycodeToKeysym(_dpy, keyCode, 0);
 		}
 
 		// send CEventKeyDown event only if keyCode is defined

From ab4b8922a6a077f48c87a214bde7f8267d4d8920 Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Fri, 8 Feb 2013 03:08:42 -0800
Subject: [PATCH 06/13] Backed out changeset: 57d8f3733daf

---
 code/nel/src/3d/animation.cpp                 |  4 ++--
 code/nel/src/3d/animation_set.cpp             |  6 +++---
 code/nel/src/3d/lod_character_shape.cpp       | 12 ++++++------
 code/nel/src/3d/packed_world.cpp              |  2 +-
 code/nel/src/3d/ps_located.cpp                |  2 +-
 code/nel/src/3d/scene_group.cpp               |  2 +-
 code/nel/src/3d/shape.cpp                     |  2 +-
 code/nel/src/3d/skeleton_weight.cpp           |  2 +-
 code/nel/src/3d/tile_far_bank.cpp             |  4 ++--
 code/nel/src/3d/vegetable_shape.cpp           |  8 ++++----
 code/nel/src/3d/zone.cpp                      |  2 +-
 code/nel/src/ligo/ligo_material.cpp           |  2 +-
 code/nel/src/ligo/transition.cpp              |  2 +-
 code/nel/src/ligo/zone_region.cpp             |  2 +-
 code/nel/src/pacs/primitive_block_pacs.cpp    |  2 +-
 code/ryzom/client/src/string_manager_client.h |  4 ++--
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/code/nel/src/3d/animation.cpp b/code/nel/src/3d/animation.cpp
index 8cd51cc46..9cfd3f26b 100644
--- a/code/nel/src/3d/animation.cpp
+++ b/code/nel/src/3d/animation.cpp
@@ -89,8 +89,8 @@ void CAnimation::serial (NLMISC::IStream& f)
 	nlassert(_IdByChannelId.empty());
 
 	// Serial a header
-	f.serialCheck ((uint32)"_LEN");
-	f.serialCheck ((uint32)"MINA");
+	f.serialCheck ((uint32)'_LEN');
+	f.serialCheck ((uint32)'MINA');
 
 	// Serial a version
 	sint version=f.serialVersion (2);
diff --git a/code/nel/src/3d/animation_set.cpp b/code/nel/src/3d/animation_set.cpp
index 79f59b565..94946799b 100644
--- a/code/nel/src/3d/animation_set.cpp
+++ b/code/nel/src/3d/animation_set.cpp
@@ -185,9 +185,9 @@ void CAnimationSet::serial (NLMISC::IStream& f)
 	nlassert(!_AnimHeaderOptimisation);
 
 	// Serial an header
-	f.serialCheck ((uint32)"_LEN");
-	f.serialCheck ((uint32)"MINA");
-	f.serialCheck ((uint32)"TES_");
+	f.serialCheck ((uint32)'_LEN');
+	f.serialCheck ((uint32)'MINA');
+	f.serialCheck ((uint32)'TES_');
 
 	// Serial a version
 	uint	ver= f.serialVersion (1);
diff --git a/code/nel/src/3d/lod_character_shape.cpp b/code/nel/src/3d/lod_character_shape.cpp
index 24e87baa8..09aded766 100644
--- a/code/nel/src/3d/lod_character_shape.cpp
+++ b/code/nel/src/3d/lod_character_shape.cpp
@@ -264,9 +264,9 @@ void	CLodCharacterShapeBuild::compile(const std::vector<bool> &triangleSelection
 void	CLodCharacterShapeBuild::serial(NLMISC::IStream &f)
 {
 	// NEL_CLODBULD
-	f.serialCheck((uint32)"_LEN");
-	f.serialCheck((uint32)"DOLC");
-	f.serialCheck((uint32)"DLUB");
+	f.serialCheck((uint32)'_LEN');
+	f.serialCheck((uint32)'DOLC');
+	f.serialCheck((uint32)'DLUB');
 
 	/*
 	Version 1:
@@ -525,9 +525,9 @@ void			CLodCharacterShape::CBoneInfluence::serial(NLMISC::IStream &f)
 void			CLodCharacterShape::serial(NLMISC::IStream &f)
 {
 	// NEL_CLODSHAP
-	f.serialCheck((uint32)"_LEN");
-	f.serialCheck((uint32)"DOLC");
-	f.serialCheck((uint32)"PAHS");
+	f.serialCheck((uint32)'_LEN');
+	f.serialCheck((uint32)'DOLC');
+	f.serialCheck((uint32)'PAHS');
 
 	/*
 	Version 1:
diff --git a/code/nel/src/3d/packed_world.cpp b/code/nel/src/3d/packed_world.cpp
index db86191b4..64b669fc4 100644
--- a/code/nel/src/3d/packed_world.cpp
+++ b/code/nel/src/3d/packed_world.cpp
@@ -152,7 +152,7 @@ void CPackedWorld::getZones(std::vector<TPackedZoneBaseSPtr> &zones)
 void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream)
 {
 	f.serialVersion(1);
-	f.serialCheck((uint32) "OWPA");
+	f.serialCheck((uint32) 'OWPA');
 	f.serialCont(ZoneNames);
 }
 
diff --git a/code/nel/src/3d/ps_located.cpp b/code/nel/src/3d/ps_located.cpp
index 668db58a1..f066b6f3c 100644
--- a/code/nel/src/3d/ps_located.cpp
+++ b/code/nel/src/3d/ps_located.cpp
@@ -73,7 +73,7 @@ CPSLocated::CPSLocated() : /*_MaxNumFaces(0),*/
 						   _ParametricMotion(false),
 						   _TriggerOnDeath(false),
 						   _LastForever(true),
-						   _TriggerID((uint32) "NONE"),
+						   _TriggerID((uint32) 'NONE'),
 						   _NonIntegrableForceNbRefs(0),
 						   _NumIntegrableForceWithDifferentBasis(0)
 {
diff --git a/code/nel/src/3d/scene_group.cpp b/code/nel/src/3d/scene_group.cpp
index e9f98ab04..7cfa56b02 100644
--- a/code/nel/src/3d/scene_group.cpp
+++ b/code/nel/src/3d/scene_group.cpp
@@ -405,7 +405,7 @@ void CInstanceGroup::serial (NLMISC::IStream& f)
 	 * ***********************************************/
 
 	// Serial a header
-	f.serialCheck ((uint32)"TPRG");
+	f.serialCheck ((uint32)'TPRG');
 
 	/*
 	Version 5:
diff --git a/code/nel/src/3d/shape.cpp b/code/nel/src/3d/shape.cpp
index dbb099b64..adc610827 100644
--- a/code/nel/src/3d/shape.cpp
+++ b/code/nel/src/3d/shape.cpp
@@ -116,7 +116,7 @@ IShape*	CShapeStream::getShapePointer () const
 void CShapeStream::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 {
 	// First, serial an header or checking if it is correct
-	f.serialCheck ((uint32)"PAHS");
+	f.serialCheck ((uint32)'PAHS');
 
 	// Then, serial the shape
 	f.serialPolyPtr (_Shape);
diff --git a/code/nel/src/3d/skeleton_weight.cpp b/code/nel/src/3d/skeleton_weight.cpp
index e5962b66d..4668a005a 100644
--- a/code/nel/src/3d/skeleton_weight.cpp
+++ b/code/nel/src/3d/skeleton_weight.cpp
@@ -60,7 +60,7 @@ void CSkeletonWeight::build (const TNodeArray& array)
 void CSkeletonWeight::serial (NLMISC::IStream& f)
 {
 	// Serial a header
-	f.serialCheck ((uint32)"TWKS");
+	f.serialCheck ((uint32)'TWKS');
 
 	// Serial a version number
 	(void)f.serialVersion (0);
diff --git a/code/nel/src/3d/tile_far_bank.cpp b/code/nel/src/3d/tile_far_bank.cpp
index 4aa95f872..75a758560 100644
--- a/code/nel/src/3d/tile_far_bank.cpp
+++ b/code/nel/src/3d/tile_far_bank.cpp
@@ -104,8 +104,8 @@ const sint CTileFarBank::_Version=0x0;
 void CTileFarBank::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 {
 	// Write/Check "FAR_BANK" in header of the stream
-	f.serialCheck ((uint32)"_RAF");
-	f.serialCheck ((uint32)"KNAB");
+	f.serialCheck ((uint32)'_RAF');
+	f.serialCheck ((uint32)'KNAB');
 
 	// Serial version
 	(void)f.serialVersion(_Version);
diff --git a/code/nel/src/3d/vegetable_shape.cpp b/code/nel/src/3d/vegetable_shape.cpp
index f10591bf9..0b8697d63 100644
--- a/code/nel/src/3d/vegetable_shape.cpp
+++ b/code/nel/src/3d/vegetable_shape.cpp
@@ -192,10 +192,10 @@ void		CVegetableShape::serial(NLMISC::IStream &f)
 		- BestSidedPreComputeLighting
 	*/
 	sint	ver= f.serialVersion(1);
-	f.serialCheck((uint32)"_LEN");
-	f.serialCheck((uint32)"GEV_");
-	f.serialCheck((uint32)"BATE");
-	f.serialCheck((uint32)"__EL");
+	f.serialCheck((uint32)'_LEN');
+	f.serialCheck((uint32)'GEV_');
+	f.serialCheck((uint32)'BATE');
+	f.serialCheck((uint32)'__EL');
 
 	f.serial(Lighted);
 	f.serial(DoubleSided);
diff --git a/code/nel/src/3d/zone.cpp b/code/nel/src/3d/zone.cpp
index 5b923af56..4acca80f5 100644
--- a/code/nel/src/3d/zone.cpp
+++ b/code/nel/src/3d/zone.cpp
@@ -458,7 +458,7 @@ void			CZone::serial(NLMISC::IStream &f)
 		throw EOlderStream(f);
 	}
 
-	f.serialCheck((uint32)"ENOZ");
+	f.serialCheck((uint32)'ENOZ');
 
 	f.xmlSerial (ZoneId, "ZONE_ID");
 	f.xmlSerial (ZoneBB, "BB");
diff --git a/code/nel/src/ligo/ligo_material.cpp b/code/nel/src/ligo/ligo_material.cpp
index a51dd3171..643629648 100644
--- a/code/nel/src/ligo/ligo_material.cpp
+++ b/code/nel/src/ligo/ligo_material.cpp
@@ -80,7 +80,7 @@ void CMaterial::serial (NLMISC::IStream &s)
 	s.xmlPush ("LIGO_MATERIAL");
 
 		// Serial the header
-		s.serialCheck ((uint32)"TMOL");
+		s.serialCheck ((uint32)'TMOL');
 
 		// Serial the version
 		/*sint ver =*/ s.serialVersion (0);
diff --git a/code/nel/src/ligo/transition.cpp b/code/nel/src/ligo/transition.cpp
index 4b90c9078..b13c4f566 100644
--- a/code/nel/src/ligo/transition.cpp
+++ b/code/nel/src/ligo/transition.cpp
@@ -199,7 +199,7 @@ void CTransition::serial (NLMISC::IStream &s)
 	s.xmlPush ("LIGO_TRANSITION");
 
 		// Serial the header
-		s.serialCheck ((uint32)"STGL");
+		s.serialCheck ((uint32)'STGL');
 
 		// Serial the version
 		/*sint ver =*/ s.serialVersion (0);
diff --git a/code/nel/src/ligo/zone_region.cpp b/code/nel/src/ligo/zone_region.cpp
index 71f4c06c2..ad65aec8e 100644
--- a/code/nel/src/ligo/zone_region.cpp
+++ b/code/nel/src/ligo/zone_region.cpp
@@ -153,7 +153,7 @@ void CZoneRegion::serial (NLMISC::IStream &f)
 	f.xmlPush ("LAND");
 
 		sint32 version = f.serialVersion (1);
-		f.serialCheck ((uint32)"DNAL");
+		f.serialCheck ((uint32)'DNAL');
 
 		f.xmlSerial (_MinX, "MIN_X");
 		f.xmlSerial (_MinY, "MIN_Y");
diff --git a/code/nel/src/pacs/primitive_block_pacs.cpp b/code/nel/src/pacs/primitive_block_pacs.cpp
index 14dd2764b..0681d2eea 100644
--- a/code/nel/src/pacs/primitive_block_pacs.cpp
+++ b/code/nel/src/pacs/primitive_block_pacs.cpp
@@ -85,7 +85,7 @@ void CPrimitiveBlock::serial (NLMISC::IStream &s)
 	s.xmlPush ("PRIMITIVE_BLOCK");
 
 	// Serial checks
-	s.serialCheck ((uint32)"KBRP");
+	s.serialCheck ((uint32)'KBRP');
 
 	// Serial the version
 	(void)s.serialVersion (0);
diff --git a/code/ryzom/client/src/string_manager_client.h b/code/ryzom/client/src/string_manager_client.h
index 7be20d5bb..89e05acd0 100644
--- a/code/ryzom/client/src/string_manager_client.h
+++ b/code/ryzom/client/src/string_manager_client.h
@@ -341,8 +341,8 @@ private:
 
 		void	serial(NLMISC::IStream &f)
 		{
-			f.serialCheck((uint32)"_RTS");
-			f.serialCheck((uint32)"KCAP");
+			f.serialCheck((uint32)'_RTS');
+			f.serialCheck((uint32)'KCAP');
 			f.serialVersion(0);
 			f.serial(PackedVersion);
 			f.serial(LanguageCode);

From 132a4d693425318a52803185f3291a63e5fab093 Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Fri, 8 Feb 2013 03:08:59 -0800
Subject: [PATCH 07/13] Backed out changeset: e36d69e04aa1

---
 code/nel/src/3d/vertex_program_parse.cpp | 98 ++++++++++++------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/code/nel/src/3d/vertex_program_parse.cpp b/code/nel/src/3d/vertex_program_parse.cpp
index 25ed6e9f4..4ac59e097 100644
--- a/code/nel/src/3d/vertex_program_parse.cpp
+++ b/code/nel/src/3d/vertex_program_parse.cpp
@@ -258,21 +258,21 @@ bool CVPParser::parseInputRegister(CVPOperand &operand, std::string &errorOutput
 		}
 		switch (strValue)
 		{
-			case 'OPOS': operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
-			case 'WGHT': operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
-			case 'NRML': operand.Value.InputRegisterValue = CVPOperand::INormal; break;
-			case 'COL0': operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
-			case 'COL1': operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
-			case 'FOGC': operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
+			case "OPOS": operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
+			case "WGHT": operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
+			case "NRML": operand.Value.InputRegisterValue = CVPOperand::INormal; break;
+			case "COL0": operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
+			case "COL1": operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
+			case "FOGC": operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
 			// texture argument
-			case 'TEX0':
-			case 'TEX1':
-			case 'TEX2':
-			case 'TEX3':
-			case 'TEX4':
-			case 'TEX5':
-			case 'TEX6':
-			case 'TEX7':
+			case "TEX0":
+			case "TEX1":
+			case "TEX2":
+			case "TEX3":
+			case "TEX4":
+			case "TEX5":
+			case "TEX6":
+			case "TEX7":
 				operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0');
 			break;
 			default:
@@ -386,21 +386,21 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
 	// convert to enum
 	switch(strValue)
 	{
-		case 'HPOS': operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
-		case 'COL0': operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
-		case 'COL1': operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
-		case 'BFC0': operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
-		case 'BFC1': operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
-		case 'FOGC': operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
-		case 'PSIZ': operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
-		case 'TEX0': operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
-		case 'TEX1': operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
-		case 'TEX2': operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
-		case 'TEX3': operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
-		case 'TEX4': operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
-		case 'TEX5': operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
-		case 'TEX6': operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
-		case 'TEX7': operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
+		case "HPOS": operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
+		case "COL0": operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
+		case "COL1": operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
+		case "BFC0": operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
+		case "BFC1": operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
+		case "FOGC": operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
+		case "PSIZ": operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
+		case "TEX0": operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
+		case "TEX1": operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
+		case "TEX2": operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
+		case "TEX3": operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
+		case "TEX4": operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
+		case "TEX5": operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
+		case "TEX6": operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
+		case "TEX7": operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
 		default:
 			errorOutput = "Can't read index for output register.";
 			return false;
@@ -755,7 +755,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	}
 	switch (instrStr)
 	{
-		case 'ARL ':
+		case "ARL ":
 			instr.Opcode = CVPInstruction::ARL;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -764,7 +764,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case 'RSQ ':
+		case "RSQ ":
 			instr.Opcode = CVPInstruction::RSQ;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -773,8 +773,8 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case 'EXP ':
-		case 'EXPP':
+		case "EXP ":
+		case "EXPP":
 			instr.Opcode = CVPInstruction::EXPP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -789,7 +789,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}*/
 		break;
-		case 'LOG ':
+		case "LOG ":
 			instr.Opcode = CVPInstruction::LOG;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -805,7 +805,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 			*/
 		break;
-		case 'RCP ':
+		case "RCP ":
 			instr.Opcode = CVPInstruction::RCP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -815,60 +815,60 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 		break;
 		/////////////////
-		case 'MOV ':
+		case "MOV ":
 			instr.Opcode = CVPInstruction::MOV;
 			if (!parseOp2(instr, errorOutput)) return false;
 
 		break;
-		case 'LIT ':
+		case "LIT ":
 			instr.Opcode = CVPInstruction::LIT;
 			if (!parseOp2(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'MAD ':
+		case "MAD ":
 			instr.Opcode = CVPInstruction::MAD;
 			if (!parseOp4(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'ADD ':
+		case "ADD ":
 			instr.Opcode = CVPInstruction::ADD;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'MUL ':
+		case "MUL ":
 			instr.Opcode = CVPInstruction::MUL;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DP3 ':
+		case "DP3 ":
 			instr.Opcode = CVPInstruction::DP3;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DP4 ':
+		case "DP4 ":
 			instr.Opcode = CVPInstruction::DP4;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'DST ':
+		case "DST ":
 			instr.Opcode = CVPInstruction::DST;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'MIN ':
+		case "MIN ":
 			instr.Opcode = CVPInstruction::MIN;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'MAX ':
+		case "MAX ":
 			instr.Opcode = CVPInstruction::MAX;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'SLT ':
+		case "SLT ":
 			instr.Opcode = CVPInstruction::SLT;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case 'SGE ':
+		case "SGE ":
 			instr.Opcode = CVPInstruction::SGE;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case 'END ':
+		case "END ":
 			endEncountered = true;
 			return true;
 		break;
@@ -885,7 +885,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	}
 
 	// it is not allowed to write to an adress register except for ARL
-	if (instrStr != 'ARL ')
+	if (instrStr != "ARL ")
 	{
 		if (instr.Dest.Type == CVPOperand::AddressRegister)
 		{

From be84d3230695af664f3cd6799246b3099aafb8b9 Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Fri, 8 Feb 2013 03:09:17 -0800
Subject: [PATCH 08/13] Backed out changeset: 97505c669e04

---
 code/nel/include/nel/georges/load_form.h | 2 +-
 code/ryzom/client/src/character_cl.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/nel/include/nel/georges/load_form.h b/code/nel/include/nel/georges/load_form.h
index 6bf6c83c3..df4f93fb9 100644
--- a/code/nel/include/nel/georges/load_form.h
+++ b/code/nel/include/nel/georges/load_form.h
@@ -109,7 +109,7 @@ struct TLoadFormDicoEntry
 	}
 };
 */
-const uint32		PACKED_SHEET_HEADER = 'PKSH';
+const uint32		PACKED_SHEET_HEADER = "PKSH";
 const uint32		PACKED_SHEET_VERSION = 5;
 // This Version may be used if you want to use the serialVersion() system in loadForm()
 const uint32		PACKED_SHEET_VERSION_COMPATIBLE = 0;
diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp
index 2f947e198..52bf10cd5 100644
--- a/code/ryzom/client/src/character_cl.cpp
+++ b/code/ryzom/client/src/character_cl.cpp
@@ -488,7 +488,7 @@ void CCharacterCL::stopAttachedFXForCurrrentAnim(bool stopLoopingFX)
 			{
 				if(!(*tmpItAttached)->FX.empty())
 				{
-					if (!(*tmpItAttached)->FX.removeByID('STOP') && !(*tmpItAttached)->FX.removeByID('main'))
+					if (!(*tmpItAttached)->FX.removeByID("STOP") && !(*tmpItAttached)->FX.removeByID("main"))
 					{
 						(*tmpItAttached)->FX.activateEmitters(false);
 					}

From bf059cccec48ec6ba14683c9a182166ea1e2cf67 Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Thu, 24 Oct 2013 21:58:11 -0700
Subject: [PATCH 09/13] Changed installer page to no_visible_elements

---
 code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php  | 2 +-
 .../tools/server/ryzom_ams/www/html/installer/libsetup.php      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
index 9f8d61cbc..40a96f6c1 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
@@ -33,7 +33,7 @@ class Helpers{
          $smarty -> debugging = false;
          // caching must be disabled for multi-language support
          $smarty -> caching = false;
-         $smarty -> cache_lifetime = 120;
+         $smarty -> cache_lifetime = 5;
 
           //needed by smarty.
          helpers :: create_folders ();
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php
index b27598e15..56a9c5b24 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php
@@ -13,6 +13,7 @@
         error_reporting( E_ALL );
 
         $return = array();
+        $return['no_visible_elements'] = false;
             
         helpers :: loadTemplate( "install" , $return );
         exit;

From d467027f110dddc9acd4ee40fa66ac7b53eb9b2d Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Sat, 26 Oct 2013 00:57:50 -0700
Subject: [PATCH 10/13] fixed bad merge

---
 code/nel/include/nel/georges/load_form.h |  2 +-
 code/nel/src/3d/vertex_program_parse.cpp | 98 ++++++++++++------------
 code/ryzom/client/src/character_cl.cpp   |  2 +-
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/code/nel/include/nel/georges/load_form.h b/code/nel/include/nel/georges/load_form.h
index df4f93fb9..4aaab43d0 100644
--- a/code/nel/include/nel/georges/load_form.h
+++ b/code/nel/include/nel/georges/load_form.h
@@ -109,7 +109,7 @@ struct TLoadFormDicoEntry
 	}
 };
 */
-const uint32		PACKED_SHEET_HEADER = "PKSH";
+const uint32		PACKED_SHEET_HEADER = NELID("PKSH");
 const uint32		PACKED_SHEET_VERSION = 5;
 // This Version may be used if you want to use the serialVersion() system in loadForm()
 const uint32		PACKED_SHEET_VERSION_COMPATIBLE = 0;
diff --git a/code/nel/src/3d/vertex_program_parse.cpp b/code/nel/src/3d/vertex_program_parse.cpp
index 1ba8ff47c..40ac2282e 100644
--- a/code/nel/src/3d/vertex_program_parse.cpp
+++ b/code/nel/src/3d/vertex_program_parse.cpp
@@ -258,21 +258,21 @@ bool CVPParser::parseInputRegister(CVPOperand &operand, std::string &errorOutput
 		}
 		switch (strValue)
 		{
-			case "OPOS": operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
-			case "WGHT": operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
-			case "NRML": operand.Value.InputRegisterValue = CVPOperand::INormal; break;
-			case "COL0": operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
-			case "COL1": operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
-			case "FOGC": operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
+			case 'OPOS': operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
+			case 'WGHT': operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
+			case 'NRML': operand.Value.InputRegisterValue = CVPOperand::INormal; break;
+			case 'COL0': operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
+			case 'COL1': operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
+			case 'FOGC': operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
 			// texture argument
-			case "TEX0":
-			case "TEX1":
-			case "TEX2":
-			case "TEX3":
-			case "TEX4":
-			case "TEX5":
-			case "TEX6":
-			case "TEX7":
+			case 'TEX0':
+			case 'TEX1':
+			case 'TEX2':
+			case 'TEX3':
+			case 'TEX4':
+			case 'TEX5':
+			case 'TEX6':
+			case 'TEX7':
 				operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0');
 			break;
 			default:
@@ -386,21 +386,21 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
 	// convert to enum
 	switch(strValue)
 	{
-		case "HPOS": operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
-		case "COL0": operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
-		case "COL1": operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
-		case "BFC0": operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
-		case "BFC1": operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
-		case "FOGC": operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
-		case "PSIZ": operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
-		case "TEX0": operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
-		case "TEX1": operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
-		case "TEX2": operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
-		case "TEX3": operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
-		case "TEX4": operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
-		case "TEX5": operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
-		case "TEX6": operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
-		case "TEX7": operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
+		case 'HPOS': operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
+		case 'COL0': operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
+		case 'COL1': operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
+		case 'BFC0': operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
+		case 'BFC1': operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
+		case 'FOGC': operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
+		case 'PSIZ': operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
+		case 'TEX0': operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
+		case 'TEX1': operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
+		case 'TEX2': operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
+		case 'TEX3': operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
+		case 'TEX4': operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
+		case 'TEX5': operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
+		case 'TEX6': operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
+		case 'TEX7': operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
 		default:
 			errorOutput = "Can't read index for output register.";
 			return false;
@@ -755,7 +755,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	}
 	switch (instrStr)
 	{
-		case "ARL ":
+		case 'ARL ':
 			instr.Opcode = CVPInstruction::ARL;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -764,7 +764,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case "RSQ ":
+		case 'RSQ ':
 			instr.Opcode = CVPInstruction::RSQ;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -773,8 +773,8 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}
 		break;
-		case "EXP ":
-		case "EXPP":
+		case 'EXP ':
+		case 'EXPP':
 			instr.Opcode = CVPInstruction::EXPP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -789,7 +789,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 				return false;
 			}*/
 		break;
-		case "LOG ":
+		case 'LOG ':
 			instr.Opcode = CVPInstruction::LOG;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -805,7 +805,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 			*/
 		break;
-		case "RCP ":
+		case 'RCP ':
 			instr.Opcode = CVPInstruction::RCP;
 			if (!parseOp2(instr, errorOutput)) return false;
 			if (!instr.Src1.Swizzle.isScalar())
@@ -815,60 +815,60 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 			}
 		break;
 		/////////////////
-		case "MOV ":
+		case 'MOV ':
 			instr.Opcode = CVPInstruction::MOV;
 			if (!parseOp2(instr, errorOutput)) return false;
 
 		break;
-		case "LIT ":
+		case 'LIT ':
 			instr.Opcode = CVPInstruction::LIT;
 			if (!parseOp2(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case "MAD ":
+		case 'MAD ':
 			instr.Opcode = CVPInstruction::MAD;
 			if (!parseOp4(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case "ADD ":
+		case 'ADD ':
 			instr.Opcode = CVPInstruction::ADD;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case "MUL ":
+		case 'MUL ':
 			instr.Opcode = CVPInstruction::MUL;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "DP3 ":
+		case 'DP3 ':
 			instr.Opcode = CVPInstruction::DP3;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "DP4 ":
+		case 'DP4 ':
 			instr.Opcode = CVPInstruction::DP4;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "DST ":
+		case 'DST ':
 			instr.Opcode = CVPInstruction::DST;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "MIN ":
+		case 'MIN ':
 			instr.Opcode = CVPInstruction::MIN;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "MAX ":
+		case 'MAX ':
 			instr.Opcode = CVPInstruction::MAX;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "SLT ":
+		case 'SLT ':
 			instr.Opcode = CVPInstruction::SLT;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
-		case "SGE ":
+		case 'SGE ':
 			instr.Opcode = CVPInstruction::SGE;
 			if (!parseOp3(instr, errorOutput)) return false;
 		break;
 		/////////////////
-		case "END ":
+		case 'END ':
 			endEncountered = true;
 			return true;
 		break;
@@ -885,7 +885,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
 	}
 
 	// it is not allowed to write to an adress register except for ARL
-	if (instrStr != "ARL ")
+	if (instrStr != NELID("ARL "))
 	{
 		if (instr.Dest.Type == CVPOperand::AddressRegister)
 		{
diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp
index 427094d3c..932819817 100644
--- a/code/ryzom/client/src/character_cl.cpp
+++ b/code/ryzom/client/src/character_cl.cpp
@@ -488,7 +488,7 @@ void CCharacterCL::stopAttachedFXForCurrrentAnim(bool stopLoopingFX)
 			{
 				if(!(*tmpItAttached)->FX.empty())
 				{
-					if (!(*tmpItAttached)->FX.removeByID("STOP") && !(*tmpItAttached)->FX.removeByID("main"))
+					if (!(*tmpItAttached)->FX.removeByID(NELID("STOP")) && !(*tmpItAttached)->FX.removeByID(NELID("main")))
 					{
 						(*tmpItAttached)->FX.activateEmitters(false);
 					}

From 09a89898f3cf182a83eb8726b73e32670c6b1411 Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Sat, 26 Oct 2013 01:11:09 -0700
Subject: [PATCH 11/13] added some hgignore settings

---
 .hgignore | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.hgignore b/.hgignore
index f4de35608..a029f4c6e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -226,3 +226,14 @@ code\ryzom\tools\server\ryzom_ams\old
 
 # AMS ignore
 code/ryzom/tools/server/ryzom_ams/www/config.php
+
+#tools and external dir's 
+external
+external_stlport
+nel_tools*
+ryzom_tools*
+
+#Dumps
+*.dmp
+
+

From 5b73e366f002cb79c18ad427068e43f3e708264a Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Sat, 26 Oct 2013 02:04:54 -0700
Subject: [PATCH 12/13] added folder placeholders

---
 code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder      | 0
 .../ryzom/tools/server/ryzom_ams/www/html/templates_c/placeholder | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder
 create mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/templates_c/placeholder

diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder b/code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/placeholder b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/placeholder
new file mode 100644
index 000000000..e69de29bb

From c50e0cd8a3bbaa0e9e4bcde9a8cde4753ceba150 Mon Sep 17 00:00:00 2001
From: Botanic <devnull@localhost>
Date: Sat, 26 Oct 2013 03:19:59 -0700
Subject: [PATCH 13/13] config.default.php

---
 code/ryzom/tools/server/ryzom_ams/www/config.default.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.default.php b/code/ryzom/tools/server/ryzom_ams/www/config.default.php
index 222f0eba0..c20ad4cdc 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/config.default.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/config.default.php
@@ -95,8 +95,8 @@ $AMS_CACHEDIR = $AMS_LIB . '/cache';
 $SITEBASE = dirname( __FILE__ ) . '/html/' ;
 
 //the paths to your website url
-$BASE_WEBPATH = dirname($_SERVER['PHP_SELF']);
-$IMAGELOC_WEBPATH = $_SERVER['REQUEST_URI'].'/img';
+$BASE_WEBPATH = '';
+$IMAGELOC_WEBPATH = $BASE_WEBPATH.'img';
 $WEBPATH = $BASE_WEBPATH . '/index.php';
 $INGAME_WEBPATH = $BASE_WEBPATH . '/index.php';
 $CONFIG_PATH = dirname( __FILE__ );