diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 15:07:17 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-21 15:07:17 -0800 |
| commit | ea0461c01287a2b026b5621616fb811bfc2d68a2 (patch) | |
| tree | f1e94df52aa6f5a68f008278cbaec0eaca063a4a /indra/viewer_components/updater/tests/llupdaterservice_test.cpp | |
| parent | 76990fab4f3c73ab1b2051421c52444de28f9d32 (diff) | |
| parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
Pull and merge https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/viewer_components/updater/tests/llupdaterservice_test.cpp')
| -rw-r--r-- | indra/viewer_components/updater/tests/llupdaterservice_test.cpp | 4 |
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() {} |