summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-13 10:28:15 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-13 10:28:15 -0500
commit584c7ecb4ed02e9ab039c6254ffc33331c31058c (patch)
tree19e34f57dc625da58f03e4eb659b721e38f072a7 /indra/viewer_components
parente7f068c37ef18315a11f1054bfd095b3420025aa (diff)
parent55322713fc071a3e171fd4cfbea989945dc8d084 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/viewer_components')
-rw-r--r--indra/viewer_components/updater/tests/llupdaterservice_test.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
index 88ab5a2284..e19d5724f1 100644
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -59,12 +59,6 @@ class LLDir_Mock : public LLDir
return 0;
}
- BOOL getNextFileInDir(const std::string &dirname,
- const std::string &mask,
- std::string &fname)
- {
- return false;
- }
void getRandomFileInDir(const std::string &dirname,
const std::string &mask,
std::string &fname) {}