Changed: #1469 Getting last version from default branch

--HG--
branch : gsoc2012-fabien

code/nel/include/nel/misc/entity_id.h

@@ -470,12 +470,12 @@ public:
 	/// return a string in form "(a:b:c:d)" where a,b,c,d are components of entity id.
 	std::string toString() const
 	{
-		std::string id;
-		id.reserve(25);
-		id+='(';
-		getDebugString (id);
-		id+=')';
-		return id;
+		std::string ident;
+		ident.reserve(25);
+		ident+='(';
+		getDebugString (ident);
+		ident+=')';
+		return ident;
 	}
 
 	/// Read from a debug string, use the same format as toString() (id:type:creator:dynamic) in hexadecimal

code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h

@@ -22,6 +22,8 @@ using NL3D::NLDRIVERGLES::CDriverGL;
 #else
 using NL3D::NLDRIVERGL::CDriverGL;
 #endif
+#else
+using NL3D::CDriverGL;
 #endif
 
 @interface CocoaApplicationDelegate : NSObject

code/nel/src/3d/driver/opengl/mac/cocoa_opengl_view.h

@@ -41,6 +41,8 @@ using NL3D::NLDRIVERGLES::CDriverGL;
 #else
 using NL3D::NLDRIVERGL::CDriverGL;
 #endif
+#else
+using NL3D::CDriverGL;
 #endif
 
 @interface CocoaOpenGLView : NSOpenGLView<NSTextInputClient>

code/nel/src/3d/driver/opengl/mac/cocoa_window_delegate.h

@@ -23,6 +23,8 @@ using NL3D::NLDRIVERGLES::CDriverGL;
 #else
 using NL3D::NLDRIVERGL::CDriverGL;
 #endif
+#else
+using NL3D::CDriverGL;
 #endif
 
 @interface CocoaWindowDelegate : NSObject

code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp

@@ -147,8 +147,9 @@ void readFormId( string& outputFileName )
 		// get the file type from form name
 		TFormId fid = (*itIF).first;
 		string fileType;
+		bool fileTypeGet = getFileType((*itIF).second, fileType);
 
-		if((*itIF).second.empty() || (*itIF).second=="." || (*itIF).second==".." || (*itIF).second[0]=='_' || (*itIF).second.find(".#")==0)
+		if((*itIF).second.empty() || (*itIF).second=="." || (*itIF).second==".." || ((*itIF).second[0]=='_' && fileType != "sound") || (*itIF).second.find(".#")==0)
 		{
 			map<TFormId,string>::iterator itErase = itIF;
 			++itIF;
@@ -156,7 +157,7 @@ void readFormId( string& outputFileName )
 		}
 		else
 		{
-			if( getFileType( (*itIF).second, fileType ) )
+			if(fileTypeGet)
 			{	
 				// insert the association (file type/file type id)
 				map<string,uint8>::iterator itFT = FileTypeToId.find(fileType);
@@ -290,7 +291,8 @@ void makeId( list<string>& dirs )
 //-----------------------------------------------
 void addId( string fileName )
 {
-	if(fileName.empty() || fileName=="." || fileName==".." || fileName[0]=='_' || fileName.find(".#")==0)
+	string extStr = CFile::getExtension( fileName );
+	if(fileName.empty() || fileName=="." || fileName==".." || (fileName[0]=='_' && extStr != "sound") || fileName.find(".#")==0)
 	{
 	  //nlinfo("Discarding file '%s'", fileName.c_str());
 	  NbFilesDiscarded++;
@@ -300,7 +302,6 @@ void addId( string fileName )
 	{
 		if( !ExtensionsAllowed.empty() )
 		{
-			string extStr = CFile::getExtension( fileName );
 			if( ExtensionsAllowed.find(extStr) == ExtensionsAllowed.end() )
 			{
 				NbFilesDiscarded++;

code/ryzom/server/src/monitor_service/service_main.cpp

@@ -31,9 +31,9 @@
 #	define NOMINMAX
 #	include <WinSock2.h>
 #	include <Windows.h>
+typedef unsigned long ulong;
 #endif // NL_OS_WINDOWS
 
-#include <my_global.h>
 #include <mysql.h>
 
 using namespace NLMISC;

code/ryzom/server/src/server_share/mysql_wrapper.h

@@ -28,9 +28,9 @@
 #ifdef NL_OS_WINDOWS
 # include <WinSock2.h>
 # include <Windows.h>
+typedef unsigned long ulong;
 #endif
 
-#include <my_global.h>
 #include <mysql.h>
 #include <time.h>