summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-01-20 16:25:26 +0200
committerMike Antipov <mantipov@productengine.com>2010-01-20 16:25:26 +0200
commita719c3631a06169c4cd1caca9a35ba5f2edc7981 (patch)
tree82539d68b6233aff7ef4e8ea7567f7611087e8a9
parentd970835f411c16e685915bf344c01f207e57c905 (diff)
Fixed major bug EXT-4364 ( Crash clicking "View IM & Chat" when someone else joins group call)
- disabled processing of Incoming dialog buttons' clicks after viewer is disconnected --HG-- branch : product-engine
-rw-r--r--indra/newview/llimview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 6064415a10..3ff156eca3 100644
--- 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();