diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-12-14 12:57:05 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-12-14 12:57:05 -0500 |
| commit | 07dd6cf67e316797974d1e26961d0d63a4b40ef2 (patch) | |
| tree | f04964498264df702bb7d63343ecb3ea3015e05b /indra/newview | |
| parent | 83299b56c4a9922a2dfa141f2ff45f3d52883c07 (diff) | |
| parent | d3293be2fe5b2bb04310ad1efc3801f724589654 (diff) | |
merge changes for DRTVWR-224
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/tests/lldir_stub.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/lldir_stub.cpp b/indra/newview/tests/lldir_stub.cpp index 3c0a4377d8..2bc6772d86 100644 --- a/indra/newview/tests/lldir_stub.cpp +++ b/indra/newview/tests/lldir_stub.cpp @@ -48,7 +48,7 @@ public: /*virtual*/ U32 countFilesInDir(const std::string &dirname, const std::string &mask) { return 42; } /*virtual*/ BOOL getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap) { fname = fname + "_NEXT"; return false; } /*virtual*/ void getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname) { fname = "RANDOM_FILE"; } - /*virtual*/ BOOL fileExists(const std::string &filename) const { return false; } + /*virtual*/ bool fileExists(const std::string &filename) const { return false; } }; LLDir_stub gDirUtil; |