5 files changed, 170 insertions, 29 deletions

diff --git a/linden/indra/llcommon/imageids.cpp b/linden/indra/llcommon/imageids.cpp
index 6b4fcd3..e5343fe 100644
--- a/linden/indra/llcommon/imageids.cpp
+++ b/linden/indra/llcommon/imageids.cpp
@@ -75,3 +75,5 @@ const LLUUID TERRAIN_MOUNTAIN_DETAIL	("303cd381-8560-7579-23f1-f0a880799740"); /
 const LLUUID TERRAIN_ROCK_DETAIL                ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER
 
 const LLUUID DEFAULT_WATER_NORMAL               ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
+
+const LLUUID DEFAULT_UNREZZED_AVATAR_PARTICLE   ("c6e07fda-aea5-4149-acb6-6f09980e0db5"); // VIEWER only
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h
index dc726dc..516fda1 100644
--- a/linden/indra/llcommon/imageids.h
+++ b/linden/indra/llcommon/imageids.h
@@ -72,4 +72,5 @@ LL_COMMON_API extern const LLUUID TERRAIN_ROCK_DETAIL;
 
 LL_COMMON_API extern const LLUUID DEFAULT_WATER_NORMAL;
 
+LL_COMMON_API extern const LLUUID DEFAULT_UNREZZED_AVATAR_PARTICLE;
 #endif
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index 32a75c0..069365b 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -50,7 +50,8 @@ std::string ll_safe_string(const char* in)
 
 std::string ll_safe_string(const char* in, S32 maxlen)
 {
-        if(in) return std::string(in, maxlen);
+//KOKUA FIXME:  Which wormhole all the antistrings (strings with negative length) come from ?
+        if(in && maxlen > 0) return std::string(in, maxlen);
         return std::string();
 }
 
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp
index a56ac47..95dd2e5 100644
--- a/linden/indra/llcommon/llsys.cpp
+++ b/linden/indra/llcommon/llsys.cpp
@@ -76,6 +76,75 @@ extern int errno;
 static const S32 CPUINFO_BUFFER_SIZE = 16383;
 LLCPUInfo gSysCPU;
 
+#if LL_WINDOWS
+#ifndef DLLVERSIONINFO
+typedef struct _DllVersionInfo
+{
+    DWORD cbSize;
+    DWORD dwMajorVersion;
+    DWORD dwMinorVersion;
+    DWORD dwBuildNumber;
+    DWORD dwPlatformID;
+}DLLVERSIONINFO;
+#endif
+
+#ifndef DLLGETVERSIONPROC
+typedef int (FAR WINAPI *DLLGETVERSIONPROC) (DLLVERSIONINFO *);
+#endif
+
+bool get_shell32_dll_version(DWORD& major, DWORD& minor, DWORD& build_number)
+{
+        bool result = false;
+        const U32 BUFF_SIZE = 32767;
+        WCHAR tempBuf[BUFF_SIZE];
+        if(GetSystemDirectory((LPWSTR)&tempBuf, BUFF_SIZE))
+        {
+                
+                std::basic_string<WCHAR> shell32_path(tempBuf);
+
+                // Shell32.dll contains the DLLGetVersion function. 
+                // according to msdn its not part of the API
+                // so you have to go in and get it.
+                // http://msdn.microsoft.com/en-us/library/bb776404(VS.85).aspx
+                shell32_path += TEXT("\\shell32.dll");
+
+                HMODULE hDllInst = LoadLibrary(shell32_path.c_str());   //load the DLL
+                if(hDllInst) 
+                {  // Could successfully load the DLL
+                        DLLGETVERSIONPROC pDllGetVersion;
+                        /*
+                        You must get this function explicitly because earlier versions of the DLL
+                        don't implement this function. That makes the lack of implementation of the
+                        function a version marker in itself.
+                        */
+                        pDllGetVersion = (DLLGETVERSIONPROC) GetProcAddress(hDllInst, 
+                                                                                                                                "DllGetVersion");
+
+                        if(pDllGetVersion) 
+                        {    
+                                // DLL supports version retrieval function
+                                DLLVERSIONINFO    dvi;
+
+                                ZeroMemory(&dvi, sizeof(dvi));
+                                dvi.cbSize = sizeof(dvi);
+                                HRESULT hr = (*pDllGetVersion)(&dvi);
+
+                                if(SUCCEEDED(hr)) 
+                                { // Finally, the version is at our hands
+                                        major = dvi.dwMajorVersion;
+                                        minor = dvi.dwMinorVersion;
+                                        build_number = dvi.dwBuildNumber;
+                                        result = true;
+                                } 
+                        } 
+
+                        FreeLibrary(hDllInst);  // Release DLL
+                } 
+        }
+        return result;
+}
+#endif // LL_WINDOWS
+
 LLOSInfo::LLOSInfo() :
         mMajorVer(0), mMinorVer(0), mBuild(0)
 {
@@ -98,44 +167,74 @@ LLOSInfo::LLOSInfo() :
         mMinorVer = osvi.dwMinorVersion;
         mBuild = osvi.dwBuildNumber;
 
+        DWORD shell32_major, shell32_minor, shell32_build;
+        bool got_shell32_version = get_shell32_dll_version(shell32_major, 
+                                                                                                           shell32_minor, 
+                                                                                                           shell32_build);
+
         switch(osvi.dwPlatformId)
         {
         case VER_PLATFORM_WIN32_NT:
                 {
                         // Test for the product.
-                        if(osvi.dwMajorVersion <= 4)
+                        if (osvi.dwMajorVersion <= 4)
                         {
                                 mOSStringSimple = "Microsoft Windows NT ";
                         }
-                        else if(osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
+                        else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
                         {
                                 mOSStringSimple = "Microsoft Windows 2000 ";
                         }
-                        else if(osvi.dwMajorVersion ==5 && osvi.dwMinorVersion == 1)
+                        else if (osvi.dwMajorVersion ==5 && osvi.dwMinorVersion == 1)
                         {
                                 mOSStringSimple = "Microsoft Windows XP ";
                         }
-                        else if(osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
+                        else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
                         {
-                                 if(osvi.wProductType == VER_NT_WORKSTATION)
+                                if (osvi.wProductType == VER_NT_WORKSTATION)
+                                {
                                         mOSStringSimple = "Microsoft Windows XP x64 Edition ";
-                                 else
-                                         mOSStringSimple = "Microsoft Windows Server 2003 ";
+                                }
+                                else
+                                {
+                                        mOSStringSimple = "Microsoft Windows Server 2003 ";
+                                }
                         }
-                        else if(osvi.dwMajorVersion == 6 && osvi.dwMinorVersion <= 1)
+                        else if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion <= 2)
                         {
-                                if(osvi.dwMinorVersion == 0)
+                                if (osvi.dwMinorVersion == 0)
                                 {
-                                        mOSStringSimple = "Microsoft Windows Vista ";
+                                        if (osvi.wProductType == VER_NT_WORKSTATION)
+                                        {
+                                                mOSStringSimple = "Microsoft Windows Vista ";
+                                        }
+                                        else
+                                        {
+                                                mOSStringSimple = "Windows Server 2008 ";
+                                        }
+
                                 }
-                                else if(osvi.dwMinorVersion == 1)
+                                else if (osvi.dwMinorVersion == 1)
                                 {
-                                        mOSStringSimple = "Microsoft Windows 7 ";
+                                        if (osvi.wProductType == VER_NT_WORKSTATION)
+                                        {
+                                                mOSStringSimple = "Microsoft Windows 7 ";
+                                        }
+                                        else
+                                        {
+                                                mOSStringSimple = "Windows Server 2008 R2 ";
+                                        }
                                 }
-
-                                if(osvi.wProductType != VER_NT_WORKSTATION)
+                                else if (osvi.dwMinorVersion == 2)
                                 {
-                                        mOSStringSimple += "Server ";
+                                        if (osvi.wProductType == VER_NT_WORKSTATION)
+                                        {
+                                                mOSStringSimple = "Microsoft Windows 8 ";
+                                        }
+                                        else
+                                        {
+                                                mOSStringSimple = "Windows Server 2012 ";
+                                        }
                                 }
 
                                 ///get native system info if available..
@@ -146,8 +245,8 @@ LLOSInfo::LLOSInfo() :
                                 pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),  "GetNativeSystemInfo"); //load kernel32 get function
                                 if(NULL != pGNSI) //check if it has failed
                                         pGNSI(&si); //success
-                                else
-                                        GetSystemInfo(&si); //if it fails get regular system info
+                                else 
+                                        GetSystemInfo(&si); //if it fails get regular system info 
                                 //(Warning: If GetSystemInfo it may result in incorrect information in a WOW64 machine, if the kernel fails to load)
 
                                 //msdn microsoft finds 32 bit and 64 bit flavors this way..
@@ -206,6 +305,7 @@ LLOSInfo::LLOSInfo() :
                                                                   csdversion.c_str(),
                                                                   (osvi.dwBuildNumber & 0xffff));
                         }
+
                         mOSString = mOSStringSimple + tmpstr;
                 }
                 break;
@@ -235,6 +335,20 @@ LLOSInfo::LLOSInfo() :
                 mOSString = mOSStringSimple;
                 break;
         }
+
+        std::string compatibility_mode;
+        if(got_shell32_version)
+        {
+                if(osvi.dwMajorVersion != shell32_major || osvi.dwMinorVersion != shell32_minor)
+                {
+                        compatibility_mode = llformat(" compatibility mode. real ver: %d.%d (Build %d)", 
+                                                                                        shell32_major,
+                                                                                        shell32_minor,
+                                                                                        shell32_build);
+                }
+        }
+        mOSString += compatibility_mode;
+
 #else
         struct utsname un;
         if(uname(&un) != -1)
@@ -262,8 +376,8 @@ LLOSInfo::LLOSInfo() :
                 else if (ostype == "Linux")
                 {
                         // Only care about major and minor Linux versions, truncate at second '.'
-                        S32 idx1 = mOSStringSimple.find_first_of(".", 0);
-                        S32 idx2 = (idx1 != std::string::npos) ? mOSStringSimple.find_first_of(".", idx1+1) : std::string::npos;
+                        std::string::size_type idx1 = mOSStringSimple.find_first_of(".", 0);
+                        std::string::size_type idx2 = (idx1 != std::string::npos) ? mOSStringSimple.find_first_of(".", idx1+1) : std::string::npos;
                         std::string simple = mOSStringSimple.substr(0, idx2);
                         if (simple.length() > 0)
                                 mOSStringSimple = simple;
@@ -429,15 +543,15 @@ LLCPUInfo::LLCPUInfo()
         mHasSSE = info->_Ext.SSE_StreamingSIMD_Extensions;
         mHasSSE2 = info->_Ext.SSE2_StreamingSIMD2_Extensions;
         mHasAltivec = info->_Ext.Altivec_Extensions;
-        mCPUMhz = (S32)(proc.GetCPUFrequency(50)/1000000.0);
+        mCPUMHz = (F64)(proc.GetCPUFrequency(50)/1000000.0);
         mFamily.assign( info->strFamily );
         mCPUString = "Unknown";
 
 #if LL_WINDOWS || LL_DARWIN || LL_SOLARIS
         out << proc.strCPUName;
-        if (200 < mCPUMhz && mCPUMhz < 10000)           // *NOTE: cpu speed is often way wrong, do a sanity check
+        if (200 < mCPUMHz && mCPUMHz < 10000)           // *NOTE: cpu speed is often way wrong, do a sanity check
         {
-                out << " (" << mCPUMhz << " MHz)";
+                out << " (" << mCPUMHz << " MHz)";
         }
         mCPUString = out.str();
         
@@ -482,7 +596,7 @@ LLCPUInfo::LLCPUInfo()
         if (LLStringUtil::convertToF64(cpuinfo["cpu mhz"], mhz)
             && 200.0 < mhz && mhz < 10000.0)
         {
-                mCPUMhz = (S32)llrint(mhz);
+                mCPUMHz = (F64)llrint(mhz);
         }
         if (!cpuinfo["model name"].empty())
                 mCPUString = cpuinfo["model name"];
@@ -505,9 +619,9 @@ bool LLCPUInfo::hasSSE2() const
         return mHasSSE2;
 }
 
-S32 LLCPUInfo::getMhz() const
+F64 LLCPUInfo::getMHz() const
 {
-        return mCPUMhz;
+        return mCPUMHz;
 }
 
 std::string LLCPUInfo::getCPUString() const
@@ -554,7 +668,7 @@ void LLCPUInfo::stream(std::ostream& s) const
         s << "->mHasSSE:     " << (U32)mHasSSE << std::endl;
         s << "->mHasSSE2:    " << (U32)mHasSSE2 << std::endl;
         s << "->mHasAltivec: " << (U32)mHasAltivec << std::endl;
-        s << "->mCPUMhz:     " << mCPUMhz << std::endl;
+        s << "->mCPUMHz:     " << mCPUMHz << std::endl;
         s << "->mCPUString:  " << mCPUString << std::endl;
 }
 
@@ -631,6 +745,26 @@ U32 LLMemoryInfo::getPhysicalMemoryClamped() const
         }
 }
 
+//static
+void LLMemoryInfo::getAvailableMemoryKB(U32& avail_physical_mem_kb, U32& avail_virtual_mem_kb)
+{
+#if LL_WINDOWS
+        MEMORYSTATUSEX state;
+        state.dwLength = sizeof(state);
+        GlobalMemoryStatusEx(&state);
+
+        avail_physical_mem_kb = (U32)(state.ullAvailPhys/1024) ;
+        avail_virtual_mem_kb = (U32)(state.ullAvailVirtual/1024) ;
+
+#else
+        //do not know how to collect available memory info for other systems.
+        //leave it blank here for now.
+
+        avail_physical_mem_kb = -1 ;
+        avail_virtual_mem_kb = -1 ;
+#endif
+}
+
 void LLMemoryInfo::stream(std::ostream& s) const
 {
 #if LL_WINDOWS
diff --git a/linden/indra/llcommon/llsys.h b/linden/indra/llcommon/llsys.h
index d5575b2..e481c88 100644
--- a/linden/indra/llcommon/llsys.h
+++ b/linden/indra/llcommon/llsys.h
@@ -81,7 +81,7 @@ public:
         bool hasAltivec() const;
         bool hasSSE() const;
         bool hasSSE2() const;
-        S32      getMhz() const;
+        F64 getMHz() const;
 
         // Family is "AMD Duron" or "Intel Pentium Pro"
         const std::string& getFamily() const { return mFamily; }
@@ -90,7 +90,7 @@ private:
         bool mHasSSE;
         bool mHasSSE2;
         bool mHasAltivec;
-        S32 mCPUMhz;
+        F64 mCPUMHz;
         std::string mFamily;
         std::string mCPUString;
 };
@@ -120,6 +120,9 @@ public:
         **  be returned.
         */
         U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes
+
+        //get the available memory infomation in KiloBytes.
+        static void getAvailableMemoryKB(U32& avail_physical_mem_kb, U32& avail_virtual_mem_kb);
 };