diff options
| author | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-11-28 16:36:34 -0500 |
| commit | e0432f98ee515f9777604aa784d28b63d2abfe40 (patch) | |
| tree | 398fcae43d9904bde2112a7085c7ef7c1a926100 /indra/newview/tests/lldir_stub.cpp | |
| parent | bf87920fc91e2ca2b8d9f6f2656ad632c3005164 (diff) | |
| parent | f5a47417fde70f78b99744386c6da0bcf78e60d5 (diff) | |
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
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() {} |