diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-09 10:47:47 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-09 10:47:47 +0200 |
| commit | fd9d1f985e93cf5eec196f9b6ba0c08c67d49aea (patch) | |
| tree | f7d8c470d385eb3bdeffe5383651dcec05e74702 /indra/newview/llfloaterimcontainer.cpp | |
| parent | 64fe330620459be18ee4dd54866386a8f6a76ab8 (diff) | |
| parent | 5ecac2e900054526c5e9e2fe5610f470ad06df32 (diff) | |
merging
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 312f70fe30..05db0e93e6 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -1154,7 +1154,7 @@ bool LLFloaterIMContainer::enableContextMenuItem(const LLSD& userdata) if ("conversation_log" == item) { - return gSavedSettings.getS32("KeepConversationLogTranscripts") > 0; + return gSavedPerAccountSettings.getS32("KeepConversationLogTranscripts") > 0; } //Enable Chat history item for ad-hoc and group conversations @@ -1805,7 +1805,7 @@ void LLFloaterIMContainer::updateSpeakBtnState() bool LLFloaterIMContainer::isConversationLoggingAllowed() { - return gSavedSettings.getS32("KeepConversationLogTranscripts") > 0; + return gSavedPerAccountSettings.getS32("KeepConversationLogTranscripts") > 0; } void LLFloaterIMContainer::flashConversationItemWidget(const LLUUID& session_id, bool is_flashes) |