summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-01 14:24:01 -0400
committerOz Linden <oz@lindenlab.com>2013-04-01 14:24:01 -0400
commit2fde4a9ae55a8641a5a7a9091af4d598b7e8d847 (patch)
tree1ffa1f6a643579fd32da5fc241f03a5fdd2cbf42 /indra/viewer_components
parente42142005585f580d39036fba02ec060d739cc5f (diff)
parent7333731bbca764fdac87173fa5a6e5f2bb46c1d2 (diff)
merge changes for 3.5.0-beta7
Diffstat (limited to 'indra/viewer_components')
-rw-r--r--indra/viewer_components/updater/tests/llupdaterservice_test.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
index a49bc4161e..de07beee7c 100644
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -83,6 +83,7 @@ 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() {}
+void LLDir::updatePerAccountChatLogsDir() {}
std::string LLDir::getExpandedFilename(ELLPath location,
const std::string &filename) const