diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-06 18:18:44 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-06 18:18:44 -0800 |
| commit | 560aba3aa4d5eb2c65132db4da355adae82a47f0 (patch) | |
| tree | e8739806c7f7beb8efc20e59442d60c0e5c88bd9 /indra/newview/llimview.cpp | |
| parent | 7ed270ff9dfdbc905dbee70907d3057a5ae490e7 (diff) | |
| parent | ec0ac12eba9d944ade7bd734226a03ea2eb47229 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 1cceb68e2a..d4c8d8c4f4 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -928,7 +928,7 @@ bool LLIMModel::addToHistory(const LLUUID& session_id, const std::string& from, bool LLIMModel::logToFile(const std::string& file_name, const std::string& from, const LLUUID& from_id, const std::string& utf8_text) { - if (gSavedSettings.getS32("KeepConversationLogTranscripts") > 1) + if (gSavedPerAccountSettings.getS32("KeepConversationLogTranscripts") > 1) { std::string from_name = from; |