diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-04-19 17:50:48 +0300 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-04-19 17:50:48 +0300 |
| commit | cfd132a0def48a3dff62aebc480feeb4639babea (patch) | |
| tree | 6d57e930162bf4d51652a07d18e68c4202e38734 /indra/newview/lldonotdisturbnotificationstorage.cpp | |
| parent | 6a339649844a6e016e35e440004a61d07dd490e6 (diff) | |
| parent | 09b70845e52f75a33c608062db6516784b31fa72 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldonotdisturbnotificationstorage.cpp')
| -rw-r--r-- | indra/newview/lldonotdisturbnotificationstorage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lldonotdisturbnotificationstorage.cpp b/indra/newview/lldonotdisturbnotificationstorage.cpp index 82affcf068..1cb650e4ea 100644 --- a/indra/newview/lldonotdisturbnotificationstorage.cpp +++ b/indra/newview/lldonotdisturbnotificationstorage.cpp @@ -215,7 +215,8 @@ void LLDoNotDisturbNotificationStorage::loadNotifications() LLFloaterReg::showInstance("im_container"); } - if(group_ad_hoc_toast_exists) + bool isConversationLoggingAllowed = gSavedPerAccountSettings.getS32("KeepConversationLogTranscripts") > 0; + if(group_ad_hoc_toast_exists && isConversationLoggingAllowed) { LLFloaterReg::showInstance("conversation"); } |