diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-12-07 17:50:37 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-12-07 17:50:37 -0500 |
| commit | b6a7c8fcfdaf9220accf832a4dc07efcd08c6eeb (patch) | |
| tree | 621f992abc5e2d0ccc596a824ba70828c463ae87 /indra/newview/tests/lldir_stub.cpp | |
| parent | 954200e97f0283a2f16d19601129d64fb16449c2 (diff) | |
| parent | a15ec8d014307da35b792659964cd5478d1aafe7 (diff) | |
Merge in backed out changes.
Diffstat (limited to 'indra/newview/tests/lldir_stub.cpp')
| -rw-r--r-- | indra/newview/tests/lldir_stub.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/lldir_stub.cpp b/indra/newview/tests/lldir_stub.cpp index 18cf4e7419..3c0a4377d8 100644 --- a/indra/newview/tests/lldir_stub.cpp +++ b/indra/newview/tests/lldir_stub.cpp @@ -32,7 +32,7 @@ BOOL LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask void LLDir::setChatLogsDir(const std::string &path) {} void LLDir::setPerAccountChatLogsDir(const std::string &first, const std::string &last) {} void LLDir::setLindenUserDir(const std::string &first, const std::string &last) {} -void LLDir::setSkinFolder(const std::string &skin_folder) {} +void LLDir::setSkinFolder(const std::string &skin_folder, const std::string& language) {} bool LLDir::setCacheDir(const std::string &path) { return true; } void LLDir::dumpCurrentDirectories() {} |