diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-01-18 00:44:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-01-18 00:44:48 +0000 |
| commit | c189fc0b579352c34285fcf03db4b5bca5cd3804 (patch) | |
| tree | ba32536c8bf3b23f311e7ae77aa69f9cbaec4582 /indra/llvfs/lldir_mac.cpp | |
| parent | 73f0b5029aa247a563862fc39152ce58baa407aa (diff) | |
Result of svn merge -r56700:56797 svn+ssh://svn/svn/linden/branches/more-random into release.
Diffstat (limited to 'indra/llvfs/lldir_mac.cpp')
| -rw-r--r-- | indra/llvfs/lldir_mac.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 591241478d..c056f982c4 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -268,7 +268,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 = ""; @@ -281,7 +281,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. |