diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-04 22:16:24 -0700 |
| commit | e271c47994fc9dd86bda9d6ad7e79799229e52aa (patch) | |
| tree | 39a95ca75541cab5952708b6cfed741394bf9e9c /indra/newview/llappviewer.cpp | |
| parent | 8cd5d361600f34a0a7fa504a721bea3301191644 (diff) | |
| parent | d41202336b7c797bc3fe4feffa8be2164518e845 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 08a1a237f5..4dacde4792 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1834,7 +1834,10 @@ bool LLAppViewer::cleanup() LLMuteList::getInstance()->cache(gAgent.getID()); //save call log list - LLConversationLog::instance().cache(); + if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) + { + LLConversationLog::instance().cache(); + } if (mPurgeOnExit) { |