diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-06 10:03:42 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-02-06 10:03:42 +0200 |
| commit | 3781615afa6db7289f26f404885ac614c7f1cee0 (patch) | |
| tree | 7dd2cade0b1a59210a9089d31820cf75e089e0cf /indra/newview/llconversationlog.cpp | |
| parent | 2fe6fce0183904936a3af7d9ce707b60b34895d1 (diff) | |
CHUI-597 (Messages shown in Conversation Log are inaccurate)
Added messages, for now they're displayed in two cases:
1) no log entries, logging disabled
2) no log entries, logging enabled
Case when there are existing log entries and
logging is disabled is still under discussion
Diffstat (limited to 'indra/newview/llconversationlog.cpp')
| -rw-r--r-- | indra/newview/llconversationlog.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 7bd6ef8cd7..5f037549ab 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -187,7 +187,8 @@ void LLConversationLogFriendObserver::changed(U32 mask) /************************************************************************/ LLConversationLog::LLConversationLog() : - mAvatarNameCacheConnection() + mAvatarNameCacheConnection(), + mLoggingEnabled(false) { LLControlVariable * keep_log_ctrlp = gSavedSettings.getControl("KeepConversationLogTranscripts").get(); S32 log_mode = keep_log_ctrlp->getValue(); @@ -202,6 +203,7 @@ LLConversationLog::LLConversationLog() : void LLConversationLog::enableLogging(S32 log_mode) { + mLoggingEnabled = log_mode > 0; if (log_mode > 0) { LLIMMgr::instance().addSessionObserver(this); @@ -217,7 +219,6 @@ void LLConversationLog::enableLogging(S32 log_mode) LLIMMgr::instance().removeSessionObserver(this); mNewMessageSignalConnection.disconnect(); LLAvatarTracker::instance().removeObserver(mFriendObserver); - mConversations.clear(); } notifyObservers(); |