1 files changed, 24 insertions, 35 deletions

diff --git a/linden/indra/llmath/llrand.cpp b/linden/indra/llmath/llrand.cpp
index 38e0639..4c214c4 100644
--- a/linden/indra/llmath/llrand.cpp
+++ b/linden/indra/llmath/llrand.cpp
@@ -1,6 +1,6 @@
 /** 
  * @file llrand.cpp
- * @brief a few useful math functions.
+ * @brief Global random generator.
  *
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
@@ -30,45 +30,34 @@
 #include "llrand.h"
 #include "lluuid.h"
 
-/* Put this back if you re-enabled slamFPCW
-#if LL_WINDOWS
-#include <float.h>
-#else
-#include <stdlib.h>
-#endif
-*/
+static LLRandLagFib2281 gRandomGenerator(LLUUID::getRandomSeed());
 
-void slamFPCW( void )
+S32 ll_rand()
 {
-/*
-#if LL_WINDOWS
-        // for Intel based CPUs, slam the FP control word directly
-    WORD wTemp, wSave;
- 
-    __asm fstcw wSave
-    if (  (wSave & 0x300)            // Not single mode
-        ||(0x3f != (wSave & 0x3f))   // Exceptions enabled
-        ||(wSave & 0xC00))           // Not round to nearest mode
-    {
-        __asm
-        {
-            mov ax, wSave
-            and ax, not 300h    ;; single mode
-            or  ax, 3fh         ;; disable all exceptions
-            and ax, not 0xC00   ;; round to nearest mode
-            mov wTemp, ax
-            fldcw   wTemp
-        }
-    }
-#endif
-*/
+        return (S32)(gRandomGenerator() * RAND_MAX);
 }
 
-LLRand  gLindenLabRandomNumber(LLUUID::getRandomSeed());
+S32 ll_rand(S32 val)
+{
+        return (S32)(gRandomGenerator() * val);
+}
+
+F32 ll_frand()
+{
+        return (F32)gRandomGenerator();
+}
 
-F32     frand(F32 val)
+F32 ll_frand(F32 val)
 {
-//      return (val * (F32)rand()/(F32)RAND_MAX);
-        return gLindenLabRandomNumber.llfrand(val);
+        return (F32)gRandomGenerator() * val;
 }
 
+F64 ll_drand()
+{
+        return gRandomGenerator();
+}
+
+F64 ll_drand(F64 val)
+{
+        return gRandomGenerator() * val;
+}