diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
| commit | 0cd40b4409b237093a771b28933ac2a33fa9f266 (patch) | |
| tree | 6aec2ccf66265722f4cb6f16774b54a7fa3eca49 /indra/llvfs/lldir_win32.h | |
| parent | ef46e7037ca59224dfcdf3745e165ee97b086a69 (diff) | |
| parent | 5cbbb565f1bba870ec6db0b266e8768ecbdb7826 (diff) | |
merge fix for STORM-579
Diffstat (limited to 'indra/llvfs/lldir_win32.h')
| -rw-r--r-- | indra/llvfs/lldir_win32.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index d3e45dc1f3..4c932c932c 100644 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h @@ -40,15 +40,14 @@ public: /*virtual*/ std::string getCurPath(); /*virtual*/ U32 countFilesInDir(const std::string &dirname, const std::string &mask); - /*virtual*/ BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap); - /*virtual*/ void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname); + /*virtual*/ BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname); /*virtual*/ BOOL fileExists(const std::string &filename) const; /*virtual*/ std::string getLLPluginLauncher(); /*virtual*/ std::string getLLPluginFilename(std::string base_name); private: - BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname, BOOL wrap); + BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname); void* mDirSearch_h; llutf16string mCurrentDir; |