merge

--HG-- branch : product-engine
2010-01-20 16:29:12 +02:00 · 2010-01-20 16:29:12 +02:00 · f2af69c993
parent 3324c736d7 a719c3631a
commit f2af69c993
1 changed files with 2 additions and 1 deletions
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@ -45,6 +45,7 @@
 #include "lluictrlfactory.h"

 #include "llagent.h"
+#include "llappviewer.h"
 #include "llavatariconctrl.h"
 #include "llbottomtray.h"
 #include "llcallingcard.h"
@ -1855,7 +1856,7 @@ void LLIncomingCallDialog::onStartIM(void* user_data)

 void LLIncomingCallDialog::processCallResponse(S32 response)
 {
-	if (!gIMMgr)
+	if (!gIMMgr || gDisconnected)
 		return;

 	LLUUID session_id = mPayload["session_id"].asUUID();