summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-08 10:10:59 -0500
committerOz Linden <oz@lindenlab.com>2013-03-08 10:10:59 -0500
commita7f02a3e51f07c657a0acd31637f46f74b30daf7 (patch)
treec572c162ee7bec027971ca7a64f74032938b20a8 /indra/viewer_components
parentcce59647a99648af63c96168c36e85563da40a1a (diff)
parent55b2383f51ffabf7e95595df5d576f383d458ee1 (diff)
merge changes for 3.5.0-beta2
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 51b63dcb7b..a7b8a74b61 100644
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -88,6 +88,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