Second Life viewer sources 1.13.2.15

3 files changed, 9 insertions, 9 deletions

diff --git a/linden/indra/llvfs/lldir_linux.cpp b/linden/indra/llvfs/lldir_linux.cpp
index 8557901..780fbdb 100644
--- a/linden/indra/llvfs/lldir_linux.cpp
+++ b/linden/indra/llvfs/lldir_linux.cpp
@@ -29,7 +29,7 @@
 
 #include "lldir_linux.h"
 #include "llerror.h"
-#include "llrand.h"             // for gLindenLabRandomNumber
+#include "llrand.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -286,8 +286,8 @@ BOOL LLDir_Linux::getNextFileInDir(const std::string &dirname, const std::string
 // automatically wrap if we've hit the end
 void LLDir_Linux::getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname)
 {
-        U32 num_files;
-        U32 which_file;
+        S32 num_files;
+        S32 which_file;
         DIR *dirp;
         dirent *entryp = NULL;
 
@@ -299,7 +299,7 @@ void LLDir_Linux::getRandomFileInDir(const std::string &dirname, const std::stri
                 return;
         }
 
-        which_file = gLindenLabRandomNumber.llrand() % num_files; 
+        which_file = ll_rand(num_files);
 
 //      llinfos << "Random select file #" << which_file << llendl;
 
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index 683b961..7f1d2ce 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -287,7 +287,7 @@ BOOL LLDir_Mac::getNextFileInDir(const std::string &dirname, const std::string &
 // get a random file in the directory
 void LLDir_Mac::getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname)
 {
-        U32 which_file;
+        S32 which_file;
         glob_t g;
         fname = "";
         
@@ -300,7 +300,7 @@ void LLDir_Mac::getRandomFileInDir(const std::string &dirname, const std::string
                 if(g.gl_pathc > 0)
                 {
                         
-                        which_file = gLindenLabRandomNumber.llrand() % g.gl_pathc; 
+                        which_file = ll_rand(g.gl_pathc);
         
 //                      llinfos << "getRandomFileInDir: returning number " << which_file << ", path is " << g.gl_pathv[which_file] << llendl;
                         // The API wants just the filename, not the full path.
diff --git a/linden/indra/llvfs/lldir_win32.cpp b/linden/indra/llvfs/lldir_win32.cpp
index 8dcaa5c..ad72752 100644
--- a/linden/indra/llvfs/lldir_win32.cpp
+++ b/linden/indra/llvfs/lldir_win32.cpp
@@ -285,8 +285,8 @@ BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::stri
 // automatically wrap if we've hit the end
 void LLDir_Win32::getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname)
 {
-        U32 num_files;
-        U32 which_file;
+        S32 num_files;
+        S32 which_file;
         HANDLE random_search_h;
 
         fname = "";
@@ -303,7 +303,7 @@ void LLDir_Win32::getRandomFileInDir(const std::string &dirname, const std::stri
                 return;
         }
 
-        which_file = gLindenLabRandomNumber.llrand() % num_files; 
+        which_file = ll_rand(num_files);
 
 //      llinfos << "Random select mp3 #" << which_file << llendl;