From c189fc0b579352c34285fcf03db4b5bca5cd3804 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Thu, 18 Jan 2007 00:44:48 +0000
Subject: Result of svn merge -r56700:56797
 svn+ssh://svn/svn/linden/branches/more-random into release.

---
 indra/llcommon/doublelinkedlist.h | 2 +-
 indra/llcommon/llptrskiplist.h    | 2 +-
 indra/llcommon/llptrskipmap.h     | 6 +++---
 indra/llcommon/llskiplist.h       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/doublelinkedlist.h b/indra/llcommon/doublelinkedlist.h
index 2546d621d0..08c21a94cf 100644
--- a/indra/llcommon/doublelinkedlist.h
+++ b/indra/llcommon/doublelinkedlist.h
@@ -1343,7 +1343,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/indra/llcommon/llptrskiplist.h b/indra/llcommon/llptrskiplist.h
index fd4dcdf87b..d73428f88f 100644
--- a/indra/llcommon/llptrskiplist.h
+++ b/indra/llcommon/llptrskiplist.h
@@ -254,7 +254,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/indra/llcommon/llptrskipmap.h b/indra/llcommon/llptrskipmap.h
index 63668c34fe..e99ea95263 100644
--- a/indra/llcommon/llptrskipmap.h
+++ b/indra/llcommon/llptrskipmap.h
@@ -324,7 +324,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;
 		}
@@ -392,7 +392,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;
 	}
 
@@ -470,7 +470,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/indra/llcommon/llskiplist.h b/indra/llcommon/llskiplist.h
index a86eb05d46..ed1aa1f0aa 100644
--- a/indra/llcommon/llskiplist.h
+++ b/indra/llcommon/llskiplist.h
@@ -223,7 +223,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;
 	}
 
-- 
cgit v1.3