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_win32.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_win32.cpp')
| -rw-r--r-- | indra/llvfs/lldir_win32.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index 0c5b0ecf19..8c2ed48813 100644 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -266,8 +266,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 = ""; @@ -284,7 +284,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; |