summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-17 13:31:47 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-17 13:31:47 -0800
commit2e015caf26fcba6ef44000588b5bad89118b63a9 (patch)
treefb09d0e5d110175ebe14abd5b1e2bf2e4710bdb2 /indra/newview
parent6710b60b104a119b91ffc468424f8c8fe25ef2da (diff)
parent36222cfa8c6960372acf10938a16fefe2a210259 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview')
-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;