Merge branch 'AlericMaster' of git://github.com/Shyotl/SingularityViewer

indra/llcommon/llsys.cpp

@@ -74,7 +74,7 @@ extern int errno;
 
 
 static const S32 CPUINFO_BUFFER_SIZE = 16383;
-LLCPUInfo gSysCPU;
+LL_COMMON_API  LLCPUInfo gSysCPU;
 
 #if LL_WINDOWS
 #ifndef DLLVERSIONINFO

indra/newview/llfloaterabout.cpp

@@ -75,7 +75,6 @@
 
 
 
-extern LLCPUInfo gSysCPU;
 extern LLMemoryInfo gSysMemory;
 extern U32 gPacketsIn;
 

indra/newview/llweb.cpp

@@ -74,7 +74,7 @@ std::string LLWeb::curlEscape(const std::string& url)
 	std::stringstream escaped_url;
 	for (std::string::const_iterator iter = url.begin(); iter != url.end(); ++iter)
 	{
-	  if (std::isalnum(*iter))
+	  if (isalnum(*iter))
 		escaped_url << *iter;
 	  else
 		escaped_url << '%' << std::hex << std::setfill('0') << std::setw(2) << std::uppercase << (int)*iter;

indra/newview/llwindebug.cpp

@@ -862,7 +862,8 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop
 		// Since there is exception info... Release the hounds.
 		gEmergencyMemoryReserve.release();
 
-		if(gSavedSettings.getControl("SaveMinidump").notNull() && gSavedSettings.getBOOL("SaveMinidump"))
+		LLControlVariable* save_minimap = gSavedSettings.getControl("SaveMinidump");
+		if(save_minimap && save_minimap->getValue().asBoolean())
 		{
 			_MINIDUMP_EXCEPTION_INFORMATION ExInfo;