diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:15:21 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:15:21 -0500 |
commit | 4839e79b20679560f697af96c11db4aef7e1d740 (patch) | |
tree | ea5faa6268fbe23de23ee03ee43d367181fba5c9 /indra/llvfs/lldir_linux.h | |
parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) | |
parent | 2632565bbced3002eb9912270b1f7303c48a0b44 (diff) |
merge STORM-102 to latest viewer-development prior to pull
Diffstat (limited to 'indra/llvfs/lldir_linux.h')
-rw-r--r-- | indra/llvfs/lldir_linux.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h index 809959e873..451e81ae93 100644 --- a/indra/llvfs/lldir_linux.h +++ b/indra/llvfs/lldir_linux.h @@ -43,8 +43,7 @@ public: 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(); |