diff options
author | Dave Parks <davep@lindenlab.com> | 2013-01-08 13:40:59 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-01-08 13:40:59 -0600 |
commit | 954ebaed84f934437fc3a18c937f08fc527359e3 (patch) | |
tree | 93f6d2c12a93045db66337bdb17167f0b312b785 /indra/viewer_components | |
parent | 716e2ea3b1e25ac8da64343d02310e8f086c48e7 (diff) | |
parent | b601bc3cbf5e999b4fd0b0b9ae024397b92cce39 (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
Diffstat (limited to 'indra/viewer_components')
-rw-r--r-- | indra/viewer_components/updater/tests/llupdaterservice_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp index db52e6c55f..a49bc4161e 100644 --- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp +++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp @@ -63,7 +63,7 @@ class LLDir_Mock : public LLDir const std::string &mask, std::string &fname) {} std::string getCurPath() { return ""; } - BOOL fileExists(const std::string &filename) const { return false; } + bool fileExists(const std::string &filename) const { return false; } std::string getLLPluginLauncher() { return ""; } std::string getLLPluginFilename(std::string base_name) { return ""; } |