summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-09-13 11:23:37 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-09-13 11:23:37 -0700
commit6b597ad40dcec2f494988eddf76376ae439c1059 (patch)
treedb15452f572d5c0ca39ba7e9f82e23c86573b8b7 /indra/newview/llappviewer.cpp
parent2084d33c1ec827b4e8d975a3bf1232e971f704e2 (diff)
parenta6370cf4a72371e090d45f2a147929d016f42780 (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 4dacde4792..08a1a237f5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1834,10 +1834,7 @@ bool LLAppViewer::cleanup()
LLMuteList::getInstance()->cache(gAgent.getID());
//save call log list
- if (gSavedPerAccountSettings.getBOOL("LogInstantMessages"))
- {
- LLConversationLog::instance().cache();
- }
+ LLConversationLog::instance().cache();
if (mPurgeOnExit)
{