11 files changed, 67 insertions, 25 deletions

diff --git a/linden/indra/llcommon/llenum.h b/linden/indra/llcommon/llenum.h
index 310ccd2..3e75a22 100644
--- a/linden/indra/llcommon/llenum.h
+++ b/linden/indra/llcommon/llenum.h
@@ -52,7 +52,7 @@ public:
                 }
         }
 
-        const U32 operator[](std::string str)
+        U32 operator[](std::string str)
         {
                 std::map<const std::string, const U32>::iterator itor;
                 itor = mEnumMap.find(str);
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index 495b9e8..76145c5 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -71,12 +71,22 @@
         #define MOZILLA_INTERNAL_API 1
 #endif
 
-// Deal with minor differences on Unixy OSes.
-#if LL_DARWIN || LL_LINUX
+// Figure out differences between compilers
+#if defined(__GNUC__)
         #define GCC_VERSION (__GNUC__ * 10000 \
                                                 + __GNUC_MINOR__ * 100 \
                                                 + __GNUC_PATCHLEVEL__)
+        #ifndef LL_GNUC
+                #define LL_GNUC 1
+        #endif
+#elif defined(__MSVC_VER__) || defined(_MSC_VER)
+        #ifndef LL_MSVC
+                #define LL_MSVC 1
+        #endif
+#endif
 
+// Deal with minor differences on Unixy OSes.
+#if LL_DARWIN || LL_LINUX
         // Different name, same functionality.
         #define stricmp strcasecmp
         #define strnicmp strncasecmp
@@ -89,9 +99,9 @@
 #endif
 
 // Deal with the differeneces on Windows
-#if LL_WINDOWS
+#if LL_MSVC
 #define snprintf safe_snprintf          /* Flawfinder: ignore */
-#endif  // LL_WINDOWS
+#endif  // LL_MSVC
 
 // Static linking with apr on windows needs to be declared.
 #ifdef LL_WINDOWS
@@ -110,7 +120,7 @@
 
 
 // Deal with VC6 problems
-#if defined(LL_WINDOWS)
+#if LL_MSVC
 #pragma warning( 3           : 4701 )   // "local variable used without being initialized"  Treat this as level 3, not level 4.
 #pragma warning( 3           : 4702 )   // "unreachable code"  Treat this as level 3, not level 4.
 #pragma warning( 3           : 4189 )   // "local variable initialized but not referenced"  Treat this as level 3, not level 4.
@@ -121,6 +131,6 @@
 #pragma warning( disable : 4503 )       // 'decorated name length exceeded, name was truncated'. Does not seem to affect compilation.
 #pragma warning( disable : 4800 )       // 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
 #pragma warning( disable : 4996 )       // warning: deprecated
-#endif  //      LL_WINDOWS
+#endif  //      LL_MSVC
 
 #endif  //      not LL_LINDEN_PREPROCESSOR_H
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp
index bd21351..e76294d 100644
--- a/linden/indra/llcommon/llprocessor.cpp
+++ b/linden/indra/llcommon/llprocessor.cpp
@@ -1538,6 +1538,7 @@ void CProcessor::GetStandardProcessorExtensions()
         CPUInfo._Ext.FXSR_FastStreamingSIMD_ExtensionsSaveRestore       = CheckBit(edxreg, 24);
         CPUInfo._Ext.SSE_StreamingSIMD_Extensions                                       = CheckBit(edxreg, 25);
         CPUInfo._Ext.SSE2_StreamingSIMD2_Extensions                                     = CheckBit(edxreg, 26);
+        CPUInfo._Ext.Altivec_Extensions = false;
         CPUInfo._Ext.SS_SelfSnoop                                                                       = CheckBit(edxreg, 27);
         CPUInfo._Ext.HT_HyperThreading                                                          = CheckBit(edxreg, 28);
         CPUInfo._Ext.HT_HyterThreadingSiblings = (ebxreg >> 16) & 0xFF;
@@ -1891,11 +1892,12 @@ const ProcessorInfo *CProcessor::GetCPUInfo()
                 break;
         }
 
-        // It's kinda like MMX or SSE...
         CPUInfo._Ext.EMMX_MultimediaExtensions = 
         CPUInfo._Ext.MMX_MultimediaExtensions = 
         CPUInfo._Ext.SSE_StreamingSIMD_Extensions =
-        CPUInfo._Ext.SSE2_StreamingSIMD2_Extensions = hasFeature("hw.optional.altivec");
+        CPUInfo._Ext.SSE2_StreamingSIMD2_Extensions = false;
+
+        CPUInfo._Ext.Altivec_Extensions = hasFeature("hw.optional.altivec");
 
 #endif
 
@@ -1912,6 +1914,7 @@ const ProcessorInfo *CProcessor::GetCPUInfo()
         CPUInfo._Ext.MMX_MultimediaExtensions = hasFeature("hw.optional.mmx");
         CPUInfo._Ext.SSE_StreamingSIMD_Extensions = hasFeature("hw.optional.sse");
         CPUInfo._Ext.SSE2_StreamingSIMD2_Extensions = hasFeature("hw.optional.sse2");
+        CPUInfo._Ext.Altivec_Extensions = false;
         CPUInfo._Ext.AA64_AMD64BitArchitecture = hasFeature("hw.optional.x86_64");
 
 #endif
@@ -2065,6 +2068,7 @@ bool CProcessor::CPUInfoToText(char *strBuffer, unsigned int uiMaxLen)
         BOOLADD("SS     Self Snoop:                                 ", CPUInfo._Ext.SS_SelfSnoop);
         BOOLADD("SSE    Streaming SIMD Extensions:                  ", CPUInfo._Ext.SSE_StreamingSIMD_Extensions);
         BOOLADD("SSE2   Streaming SIMD 2 Extensions:                ", CPUInfo._Ext.SSE2_StreamingSIMD2_Extensions);
+        BOOLADD("ALTVEC Altivec Extensions:                         ", CPUInfo._Ext.Altivec_Extensions);
         BOOLADD("TM     Thermal Monitor:                            ", CPUInfo._Ext.TM_ThermalMonitor);
         BOOLADD("TSC    Time Stamp Counter:                         ", CPUInfo._Ext.TSC_TimeStampCounter);
         BOOLADD("VME    Virtual 8086 Mode Enhancements:             ", CPUInfo._Ext.VME_Virtual8086ModeEnhancements);
diff --git a/linden/indra/llcommon/llprocessor.h b/linden/indra/llcommon/llprocessor.h
index fd9a5da..6db9328 100644
--- a/linden/indra/llcommon/llprocessor.h
+++ b/linden/indra/llcommon/llprocessor.h
@@ -71,6 +71,7 @@ typedef struct ProcessorExtensions
         bool FXSR_FastStreamingSIMD_ExtensionsSaveRestore;
         bool SSE_StreamingSIMD_Extensions;
         bool SSE2_StreamingSIMD2_Extensions;
+        bool Altivec_Extensions;
         bool SS_SelfSnoop;
         bool HT_HyperThreading;
         unsigned int HT_HyterThreadingSiblings;
diff --git a/linden/indra/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h
index be3385d..40d0c8a 100644
--- a/linden/indra/llcommon/llskiplist.h
+++ b/linden/indra/llcommon/llskiplist.h
@@ -28,11 +28,10 @@
 #ifndef LL_LLSKIPLIST_H
 #define LL_LLSKIPLIST_H
 
-#include "llerror.h"
-//#include "vmath.h"
+#include "llrand.h"
 
 // NOTA BENE: Insert first needs to be < NOT <=
-
+// Binary depth must be >= 2
 template <class DATA_TYPE, S32 BINARY_DEPTH = 10>
 class LLSkipList
 {
@@ -144,14 +143,11 @@ private:
 // Implementation
 //
 
+
+// Binary depth must be >= 2
 template <class DATA_TYPE, S32 BINARY_DEPTH>
 inline void LLSkipList<DATA_TYPE, BINARY_DEPTH>::init()
 {
-        if (BINARY_DEPTH < 2)
-        {
-                llerrs << "Trying to create skip list with too little depth, "
-                        "must be 2 or greater" << llendl;
-        }
         S32 i;
         for (i = 0; i < BINARY_DEPTH; i++)
         {
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp
index 48f2474..33e5cda 100644
--- a/linden/indra/llcommon/llsys.cpp
+++ b/linden/indra/llcommon/llsys.cpp
@@ -304,12 +304,33 @@ LLCPUInfo::LLCPUInfo()
 {
         CProcessor proc;
         const ProcessorInfo* info = proc.GetCPUInfo();
-        mHasSSE = (info->_Ext.SSE_StreamingSIMD_Extensions != 0);
-        mHasSSE2 = (info->_Ext.SSE2_StreamingSIMD2_Extensions != 0);
+        // proc.WriteInfoTextFile("procInfo.txt");
+        mHasSSE = info->_Ext.SSE_StreamingSIMD_Extensions;
+        mHasSSE2 = info->_Ext.SSE2_StreamingSIMD2_Extensions;
+        mHasAltivec = info->_Ext.Altivec_Extensions;
         mCPUMhz = (S32)(proc.GetCPUFrequency(50)/1000000.0);
         mFamily.assign( info->strFamily );
 }
 
+bool LLCPUInfo::hasAltivec() const
+{
+        return mHasAltivec;
+}
+
+bool LLCPUInfo::hasSSE() const
+{
+        return mHasSSE;
+}
+
+bool LLCPUInfo::hasSSE2() const
+{
+        return mHasSSE2;
+}
+
+S32 LLCPUInfo::getMhz() const
+{
+        return mCPUMhz;
+}
 
 std::string LLCPUInfo::getCPUString() const
 {
diff --git a/linden/indra/llcommon/llsys.h b/linden/indra/llcommon/llsys.h
index 2047d9a..83ea081 100644
--- a/linden/indra/llcommon/llsys.h
+++ b/linden/indra/llcommon/llsys.h
@@ -72,16 +72,18 @@ public:
 
         std::string getCPUString() const;
 
-        BOOL  hasSSE() const    { return mHasSSE; }
-        BOOL  hasSSE2() const   { return mHasSSE2; }
-        S32       getMhz() const        { return mCPUMhz; }
+        bool hasAltivec() const;
+        bool hasSSE() const;
+        bool hasSSE2() const;
+        S32      getMhz() const;
 
         // Family is "AMD Duron" or "Intel Pentium Pro"
         const std::string& getFamily() const { return mFamily; }
 
 private:
-        BOOL mHasSSE;
-        BOOL mHasSSE2;
+        bool mHasSSE;
+        bool mHasSSE2;
+        bool mHasAltivec;
         S32 mCPUMhz;
         std::string mFamily;
 };
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index 096cf2e..eb8310e 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -31,7 +31,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 17;
-const S32 LL_VERSION_PATCH = 2;
+const S32 LL_VERSION_PATCH = 3;
 const S32 LL_VERSION_BUILD = 0;
 
 #endif
diff --git a/linden/indra/llcommon/metaclass.cpp b/linden/indra/llcommon/metaclass.cpp
index 251795e..e545411 100644
--- a/linden/indra/llcommon/metaclass.cpp
+++ b/linden/indra/llcommon/metaclass.cpp
@@ -28,7 +28,10 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h" 
+
 #include "metaclass.h"
+
 #include "metaproperty.h"
 #include "reflective.h"
 
diff --git a/linden/indra/llcommon/metaproperty.cpp b/linden/indra/llcommon/metaproperty.cpp
index 23ed7d9..221f7a7 100644
--- a/linden/indra/llcommon/metaproperty.cpp
+++ b/linden/indra/llcommon/metaproperty.cpp
@@ -28,7 +28,10 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h" 
+
 #include "metaproperty.h"
+
 #include "metaclass.h"
 
 LLMetaProperty::LLMetaProperty(const std::string& name, const LLMetaClass& object_class) : 
diff --git a/linden/indra/llcommon/reflective.cpp b/linden/indra/llcommon/reflective.cpp
index 7c07d88..c8050e0 100644
--- a/linden/indra/llcommon/reflective.cpp
+++ b/linden/indra/llcommon/reflective.cpp
@@ -27,6 +27,8 @@
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
  */
+
+#include "linden_common.h" 
  
 #include "reflective.h"