7 files changed, 23 insertions, 8 deletions

diff --git a/linden/indra/llcommon/doublelinkedlist.h b/linden/indra/llcommon/doublelinkedlist.h
index ef289b2..833e73c 100644
--- a/linden/indra/llcommon/doublelinkedlist.h
+++ b/linden/indra/llcommon/doublelinkedlist.h
@@ -1362,7 +1362,7 @@ void LLDoubleLinkedList<DATA_TYPE>::scramble()
         DATA_TYPE *datap = getFirstData();
         while(datap)
         {
-                random_number = gLindenLabRandomNumber.llrand() % 5;
+                random_number = ll_rand(5);
 
                 if (0 == random_number)
                 {
diff --git a/linden/indra/llcommon/lldefs.h b/linden/indra/llcommon/lldefs.h
index 2bba4f8..c0435fb 100644
--- a/linden/indra/llcommon/lldefs.h
+++ b/linden/indra/llcommon/lldefs.h
@@ -132,11 +132,22 @@ const U32 RIGHT_SIDE 	= 4;
 const U32 TOP_SIDE              = 5;
 const U32 BOTTOM_SIDE   = 6;
 
+
+//
+// *NOTE: These values may be used as hard-coded numbers in scanf() variants.
+//
+// --------------
+// DO NOT CHANGE.
+// --------------
+//
 const U32       LL_MAX_PATH             = 1024;         // buffer size of maximum path + filename string length
 
 // For strings we send in messages
 const U32       STD_STRING_BUF_SIZE     = 255;  // Buffer size
 const U32       STD_STRING_STR_LEN      = 254;  // Length of the string (not including \0)
+
+// *NOTE: This value is used as hard-coded numbers in scanf() variants.
+// DO NOT CHANGE.
 const U32       MAX_STRING                      = STD_STRING_BUF_SIZE;  // Buffer size
 
 const U32       MAXADDRSTR              = 17;           // 123.567.901.345 = 15 chars + \0 + 1 for good luck
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h
index e598096..b5e0734 100644
--- a/linden/indra/llcommon/llfasttimer.h
+++ b/linden/indra/llcommon/llfasttimer.h
@@ -47,7 +47,11 @@ public:
                 FTM_IDLE,
                 FTM_SLEEP,
 
-                // common simulate components
+                // common messaging components
+                FTM_PUMP,
+                FTM_CURL,
+                
+                // common simulation components
                 FTM_UPDATE_ANIMATION,
                 FTM_UPDATE_TERRAIN,
                 FTM_UPDATE_PRIMITIVES,
diff --git a/linden/indra/llcommon/llptrskiplist.h b/linden/indra/llcommon/llptrskiplist.h
index bae40b8..df56556 100644
--- a/linden/indra/llcommon/llptrskiplist.h
+++ b/linden/indra/llcommon/llptrskiplist.h
@@ -273,7 +273,7 @@ inline BOOL LLPtrSkipList<DATA_TYPE, BINARY_DEPTH>::addData(DATA_TYPE *data)
         S32 newlevel;
         for (newlevel = 1; newlevel <= mLevel && newlevel < BINARY_DEPTH; newlevel++)
         {
-                if (frand(1.f) < 0.5f)
+                if (ll_frand() < 0.5f)
                         break;
         }
 
diff --git a/linden/indra/llcommon/llptrskipmap.h b/linden/indra/llcommon/llptrskipmap.h
index d4e4de3..c4e131f 100644
--- a/linden/indra/llcommon/llptrskipmap.h
+++ b/linden/indra/llcommon/llptrskipmap.h
@@ -343,7 +343,7 @@ inline DATA_T &LLPtrSkipMap<INDEX_T, DATA_T, BINARY_DEPTH>::addData(const INDEX_
         S32 newlevel;
         for (newlevel = 1; newlevel <= mLevel && newlevel < BINARY_DEPTH; newlevel++)
         {
-                if (frand(1.f) < 0.5f)
+                if (ll_frand() < 0.5f)
                 {
                         break;
                 }
@@ -411,7 +411,7 @@ inline DATA_T &LLPtrSkipMap<INDEX_T, DATA_T, BINARY_DEPTH>::addData(const INDEX_
         S32 newlevel;
         for (newlevel = 1; newlevel <= mLevel && newlevel < BINARY_DEPTH; newlevel++)
         {
-                if (frand(1.f) < 0.5f)
+                if (ll_frand() < 0.5f)
                         break;
         }
 
@@ -489,7 +489,7 @@ inline DATA_T &LLPtrSkipMap<INDEX_T, DATA_T, BINARY_DEPTH>::getData(const INDEX_
         S32 newlevel;
         for (newlevel = 1; newlevel <= mLevel && newlevel < BINARY_DEPTH; newlevel++)
         {
-                if (frand(1.f) < 0.5f)
+                if (ll_frand() < 0.5f)
                         break;
         }
 
diff --git a/linden/indra/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h
index 0d85749..bd28cea 100644
--- a/linden/indra/llcommon/llskiplist.h
+++ b/linden/indra/llcommon/llskiplist.h
@@ -242,7 +242,7 @@ inline BOOL LLSkipList<DATA_TYPE, BINARY_DEPTH>::addData(const DATA_TYPE& data)
         S32 newlevel;
         for (newlevel = 1; newlevel <= mLevel && newlevel < BINARY_DEPTH; newlevel++)
         {
-                if (frand(1.f) < 0.5f)
+                if (ll_frand() < 0.5f)
                         break;
         }
 
diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index 83477a1..9cb01a3 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -34,7 +34,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 13;
 const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 12;
+const S32 LL_VERSION_BUILD = 15;