Second Life viewer sources 1.21.2-RC

3 files changed, 11 insertions, 5 deletions

diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index 7d3c82d..827ec8f 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -32,6 +32,12 @@
 #ifndef LL_LINDEN_COMMON_H
 #define LL_LINDEN_COMMON_H
 
+#if defined(LL_WINDOWS) && defined(_DEBUG)
+# define _CRTDBG_MAP_ALLOC
+# include <stdlib.h>
+# include <crtdbg.h>
+#endif
+
 #include "llpreprocessor.h"
 
 #include <cstring>
diff --git a/linden/indra/llcommon/lldqueueptr.h b/linden/indra/llcommon/lldqueueptr.h
index 248357e..07addb5 100644
--- a/linden/indra/llcommon/lldqueueptr.h
+++ b/linden/indra/llcommon/lldqueueptr.h
@@ -47,7 +47,7 @@ public:
         void init();
         void destroy();
         void reset();
-        void realloc(U32 newsize);
+        void reallocate(U32 newsize);
 
         // ACCESSORS
         const Type& get(const S32 index) const;                                 // no bounds checking
@@ -115,7 +115,7 @@ template <class Type>
 inline LLDynamicQueuePtr<Type>::LLDynamicQueuePtr(const S32 size)
 {
         init();
-        realloc(size);
+        reallocate(size);
 }
 
 template <class Type>
@@ -134,7 +134,7 @@ inline void LLDynamicQueuePtr<Type>::init()
 }
 
 template <class Type>
-inline void LLDynamicQueuePtr<Type>::realloc(U32 newsize)
+inline void LLDynamicQueuePtr<Type>::reallocate(U32 newsize)
 { 
         if (newsize)
         {
@@ -308,7 +308,7 @@ inline S32	LLDynamicQueuePtr<Type>::push(const Type &obj)
 {
         if (mMaxObj - count() <= 1)
         {
-                realloc(mMaxObj * 2);
+                reallocate(mMaxObj * 2);
         }
 
         mMemory[mLastObj++] = obj;
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index cd7b304..f357b76 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -34,7 +34,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 21;
-const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_PATCH = 2;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";