diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-12-13 18:35:07 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-12-13 18:35:07 -0500 |
| commit | 9015344f8e1d246726a8dc4fbfcefb7e74525e6a (patch) | |
| tree | ef17d2dbcc573a3126049e9bc444b78b7507ebc2 /indra/newview/tests/lldir_stub.cpp | |
| parent | 3565f6f36db90e1a9a5918d8087f9dc0ab61eb69 (diff) | |
| parent | 18ff702a9965ba8b9a17326b391f8edab01242f6 (diff) | |
Merged SH-3339 work with sunshine-internal. Still a WIP.
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() {} |