summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-12 10:35:05 -0400
committerOz Linden <oz@lindenlab.com>2011-05-12 10:35:05 -0400
commite8810421252c6ff89d00b9a18fa6f118b4b5ac64 (patch)
tree0fa3705b3d2d4284c0caa02d198a028fedbbdadc /indra/viewer_components
parent6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff)
parente213a36f703629dcfe27ed65ac1f66a5a5194b67 (diff)
merge changes for storm-477
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) {}