diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-04-17 14:41:05 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-04-17 14:41:05 +0300 |
| commit | 9ab92603ce9ca54d4ef5571196f34ba5f0875286 (patch) | |
| tree | f8e8c70727e997a18376b01d4a98a8dae93d72fa /indra/newview/lldonotdisturbnotificationstorage.cpp | |
| parent | 3c2c897cac98e39dcc0447c2d7d458ba313a8cd6 (diff) | |
CHUI-936 FIXED Do not show Conversation log floater if logging is disabled.
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"); } |