summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-01-08 13:40:59 -0600
committerDave Parks <davep@lindenlab.com>2013-01-08 13:40:59 -0600
commit954ebaed84f934437fc3a18c937f08fc527359e3 (patch)
tree93f6d2c12a93045db66337bdb17167f0b312b785 /indra/newview/tests
parent716e2ea3b1e25ac8da64343d02310e8f086c48e7 (diff)
parentb601bc3cbf5e999b4fd0b0b9ae024397b92cce39 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
Diffstat (limited to 'indra/newview/tests')
-rw-r--r--indra/newview/tests/lldir_stub.cpp2
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;