diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-12-13 15:29:07 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-12-13 15:29:07 -0500 |
| commit | 8e99b826457ab0161c12e11e7b5465ce6a3d10f3 (patch) | |
| tree | 0b85b38d63fe13e0363076befd5784f351c23409 /indra/newview | |
| parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
| parent | e2bd5f7a9d8f5b967954c3e0bc97e662f7149af7 (diff) | |
merge changes for DRTVWR-244
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; |