summaryrefslogtreecommitdiff
path: root/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-11-20 16:20:40 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-11-20 16:20:40 -0800
commit67bc42a80ac0c125a719e2d48c974f9259c04551 (patch)
treee76b0c3acf0a53d98fb7a7fbc79d912bbb916588 /indra/viewer_components/updater/tests/llupdaterservice_test.cpp
parent1ece38912188650c9bc5a1cf906ca4a88acc21c4 (diff)
parentcca22d608deb26cf21b33629b170e70a0e221575 (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/viewer_components/updater/tests/llupdaterservice_test.cpp')
-rw-r--r--indra/viewer_components/updater/tests/llupdaterservice_test.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
index 7c016fecf9..db52e6c55f 100644
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -78,7 +78,9 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname,
void LLDir::setChatLogsDir(const std::string &path){}
void LLDir::setPerAccountChatLogsDir(const std::string &username){}
void LLDir::setLindenUserDir(const std::string &username){}
-void LLDir::setSkinFolder(const std::string &skin_folder){}
+void LLDir::setSkinFolder(const std::string &skin_folder, const std::string& language){}
+std::string LLDir::getSkinFolder() const { return "default"; }
+std::string LLDir::getLanguage() const { return "en"; }
bool LLDir::setCacheDir(const std::string &path){ return true; }
void LLDir::dumpCurrentDirectories() {}