diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-19 13:22:07 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-19 13:22:07 -0800 |
| commit | 2eec4949cc49f3c59cdc278be0e7eed1e092b167 (patch) | |
| tree | c46a24bf021dccd724ba199bcf48a9b9b6ff0aca /indra/llvfs/lldir_win32.h | |
| parent | 9053aa7d1cb53445f7c7e8d929e3850807b52228 (diff) | |
| parent | 1139584b026db86fd20364d0eb21b6e2351f8fb1 (diff) | |
Merge latest from lindenlab/viewer-development
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; |