diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-04 13:35:38 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-04 13:35:38 -0700 |
| commit | 5c14f6e783c2581d0e4401d82581e7a5def99043 (patch) | |
| tree | 579fe240496416f3c09ed7b9e29d1e06b0b2a570 /indra/newview/llappviewer.cpp | |
| parent | 5fbb161ba0a28e64474efc295b12bccffdcdb0e0 (diff) | |
| parent | 7bad109c3d7e6d70649839634586a09033cfb207 (diff) | |
merging in latest changes
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) { |