From 57b21335ba232d4023ec2cda81153d02bc190f6b Mon Sep 17 00:00:00 2001
From: mberezhnoy <mberezhnoy@productengine.com>
Date: Wed, 5 Jun 2013 20:57:54 +0300
Subject: [PATCH] CHUI-953 (Viewer does not quit after confirming to quit first
time) removed DND hack
---
indra/newview/llfloaterimcontainer.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 3783ae60e72..01278e0637d 100755
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -2121,8 +2121,8 @@ void LLFloaterIMContainer::closeFloater(bool app_quitting/* = false*/)
{
if(app_quitting)
{
- gAgent.setDoNotDisturb(true);
closeAllConversations();
+ onClickCloseBtn();
}
// Check for currently active session
@@ -2139,11 +2139,6 @@ void LLFloaterIMContainer::closeFloater(bool app_quitting/* = false*/)
if (active_conversation)
{
active_conversation->closeFloater();
- if(app_quitting)
- {
- LLFloater::closeFloater(app_quitting);
- }
-
}
}
}
--
GitLab