diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-06-05 20:57:54 +0300 | 
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-06-05 20:57:54 +0300 | 
| commit | 57b21335ba232d4023ec2cda81153d02bc190f6b (patch) | |
| tree | 8da4acb5204432df2ba5044bfb31edbfef7d9bdc | |
| parent | 773a296383ebad29ad3f7a618405535e306d71b1 (diff) | |
CHUI-953 (Viewer does not quit after confirming to quit first time)
removed DND hack
| -rwxr-xr-x | indra/newview/llfloaterimcontainer.cpp | 7 | 
1 files changed, 1 insertions, 6 deletions
| diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 3783ae60e7..01278e0637 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); -			} -  		}  	}  } | 
