Second Life viewer sources 1.18.0.6

10 files changed, 44 insertions, 67 deletions

diff --git a/linden/indra/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h
index 291da19..7942e77 100644
--- a/linden/indra/llcommon/lldarray.h
+++ b/linden/indra/llcommon/lldarray.h
@@ -189,16 +189,17 @@ public:
 
         void reset() { mVector.resize(0); mIndexMap.resize(0); }
         bool empty() const { return mVector.empty(); }
-        size_type size() const { return mVector.empty(); }
+        size_type size() const { return mVector.size(); }
         
         Type& operator[](const Key& k)
         {
-                typename std::map<Key, U32>::iterator iter = mIndexMap.find(k);
+                typename std::map<Key, U32>::const_iterator iter = mIndexMap.find(k);
                 if (iter == mIndexMap.end())
                 {
                         U32 n = mVector.size();
                         mIndexMap[k] = n;
                         mVector.resize(n+1);
+                        llassert(mVector.size() == mIndexMap.size());
                         return mVector[n];
                 }
                 else
@@ -206,7 +207,19 @@ public:
                         return mVector[iter->second];
                 }
         }
-        
+
+        const_iterator find(const Key& k) const
+        {
+                typename std::map<Key, U32>::const_iterator iter = mIndexMap.find(k);
+                if(iter == mIndexMap.end())
+                {
+                        return mVector.end();
+                }
+                else
+                {
+                        return mVector.begin() + iter->second;
+                }
+        }
 };
 
 #endif
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index 76145c5..495b9e8 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -71,22 +71,12 @@
         #define MOZILLA_INTERNAL_API 1
 #endif
 
-// Figure out differences between compilers
-#if defined(__GNUC__)
+// Deal with minor differences on Unixy OSes.
+#if LL_DARWIN || LL_LINUX
         #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
@@ -99,9 +89,9 @@
 #endif
 
 // Deal with the differeneces on Windows
-#if LL_MSVC
+#if LL_WINDOWS
 #define snprintf safe_snprintf          /* Flawfinder: ignore */
-#endif  // LL_MSVC
+#endif  // LL_WINDOWS
 
 // Static linking with apr on windows needs to be declared.
 #ifdef LL_WINDOWS
@@ -120,7 +110,7 @@
 
 
 // Deal with VC6 problems
-#if LL_MSVC
+#if defined(LL_WINDOWS)
 #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.
@@ -131,6 +121,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_MSVC
+#endif  //      LL_WINDOWS
 
 #endif  //      not LL_LINDEN_PREPROCESSOR_H
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp
index e76294d..bd21351 100644
--- a/linden/indra/llcommon/llprocessor.cpp
+++ b/linden/indra/llcommon/llprocessor.cpp
@@ -1538,7 +1538,6 @@ 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;
@@ -1892,12 +1891,11 @@ 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 = false;
-
-        CPUInfo._Ext.Altivec_Extensions = hasFeature("hw.optional.altivec");
+        CPUInfo._Ext.SSE2_StreamingSIMD2_Extensions = hasFeature("hw.optional.altivec");
 
 #endif
 
@@ -1914,7 +1912,6 @@ 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
@@ -2068,7 +2065,6 @@ 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 6db9328..fd9a5da 100644
--- a/linden/indra/llcommon/llprocessor.h
+++ b/linden/indra/llcommon/llprocessor.h
@@ -71,7 +71,6 @@ 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 40d0c8a..be3385d 100644
--- a/linden/indra/llcommon/llskiplist.h
+++ b/linden/indra/llcommon/llskiplist.h
@@ -28,10 +28,11 @@
 #ifndef LL_LLSKIPLIST_H
 #define LL_LLSKIPLIST_H
 
-#include "llrand.h"
+#include "llerror.h"
+//#include "vmath.h"
 
 // NOTA BENE: Insert first needs to be < NOT <=
-// Binary depth must be >= 2
+
 template <class DATA_TYPE, S32 BINARY_DEPTH = 10>
 class LLSkipList
 {
@@ -143,11 +144,14 @@ 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/llstreamtools.h b/linden/indra/llcommon/llstreamtools.h
index c339dde..d64bd57 100644
--- a/linden/indra/llcommon/llstreamtools.h
+++ b/linden/indra/llcommon/llstreamtools.h
@@ -60,11 +60,13 @@ bool skip_to_end_of_next_keyword(const char* keyword, std::istream& input_stream
 //bool skip_to_start_of_next_keyword(const char* keyword, std::istream& input_stream);
 
 // characters are pulled out of input_stream and appended to output_string
+// returns result of input_stream.good() after characters are pulled
 bool get_word(std::string& output_string, std::istream& input_stream);
 bool get_line(std::string& output_string, std::istream& input_stream);
 
 // characters are pulled out of input_stream (up to a max of 'n')
 // and appended to output_string 
+// returns result of input_stream.good() after characters are pulled
 bool get_word(std::string& output_string, std::istream& input_stream, int n);
 bool get_line(std::string& output_string, std::istream& input_stream, int n);
 
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index a24f944..adfdfb8 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -1074,9 +1074,6 @@ BOOL LLStringBase<T>::isHead( const std::basic_string<T>& string, const T* s )
 template<class T> 
 BOOL LLStringBase<T>::read(std::basic_string<T>& string, const char* filename)   /*Flawfinder: ignore*/
 {
-#ifdef LL_LINUX
-    printf("STUBBED: LLStringBase<T>::read at %s:%d\n", __FILE__, __LINE__);
-#else
         llifstream ifs(filename, llifstream::binary);
         if (!ifs.is_open())
         {
@@ -1091,7 +1088,6 @@ BOOL LLStringBase<T>::read(std::basic_string<T>& string, const char* filename)
         string = oss.str();
 
         ifs.close();
-#endif
         return TRUE;
 }
 
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp
index 33e5cda..48f2474 100644
--- a/linden/indra/llcommon/llsys.cpp
+++ b/linden/indra/llcommon/llsys.cpp
@@ -304,33 +304,12 @@ LLCPUInfo::LLCPUInfo()
 {
         CProcessor proc;
         const ProcessorInfo* info = proc.GetCPUInfo();
-        // proc.WriteInfoTextFile("procInfo.txt");
-        mHasSSE = info->_Ext.SSE_StreamingSIMD_Extensions;
-        mHasSSE2 = info->_Ext.SSE2_StreamingSIMD2_Extensions;
-        mHasAltivec = info->_Ext.Altivec_Extensions;
+        mHasSSE = (info->_Ext.SSE_StreamingSIMD_Extensions != 0);
+        mHasSSE2 = (info->_Ext.SSE2_StreamingSIMD2_Extensions != 0);
         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 83ea081..2047d9a 100644
--- a/linden/indra/llcommon/llsys.h
+++ b/linden/indra/llcommon/llsys.h
@@ -72,18 +72,16 @@ public:
 
         std::string getCPUString() const;
 
-        bool hasAltivec() const;
-        bool hasSSE() const;
-        bool hasSSE2() const;
-        S32      getMhz() const;
+        BOOL  hasSSE() const    { return mHasSSE; }
+        BOOL  hasSSE2() const   { return mHasSSE2; }
+        S32       getMhz() const        { return mCPUMhz; }
 
         // Family is "AMD Duron" or "Intel Pentium Pro"
         const std::string& getFamily() const { return mFamily; }
 
 private:
-        bool mHasSSE;
-        bool mHasSSE2;
-        bool mHasAltivec;
+        BOOL mHasSSE;
+        BOOL mHasSSE2;
         S32 mCPUMhz;
         std::string mFamily;
 };
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index eb8310e..9739d04 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -30,8 +30,8 @@
 #define LL_LLVERSION_H
 
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 17;
-const S32 LL_VERSION_PATCH = 3;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_MINOR = 18;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 6;
 
 #endif