summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2009-11-09 22:04:23 +0200
committerSergei Litovchuk <slitovchuk@productengine.com>2009-11-09 22:04:23 +0200
commit31cc68ecd373d4deae85bbd223f5d47ffef34a24 (patch)
tree51db218fc6c46edf65233a26c906f8aa3f020b4e
parent34771c04c375afabac4a59573bdd58081081ef8e (diff)
Fixed normal bug EXT-2327 "Incoming call dialog crashes after logout".
- Added NULL pointer checks. --HG-- branch : product-engine
-rw-r--r--indra/newview/llimview.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index fdf119fbee..d91fc1a06b 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1157,6 +1157,9 @@ void LLIncomingCallDialog::onStartIM(void* user_data)
void LLIncomingCallDialog::processCallResponse(S32 response)
{
+ if (!gIMMgr)
+ return;
+
LLUUID session_id = mPayload["session_id"].asUUID();
EInstantMessage type = (EInstantMessage)mPayload["type"].asInteger();
LLIMMgr::EInvitationType inv_type = (LLIMMgr::EInvitationType)mPayload["inv_type"].asInteger();
@@ -1254,6 +1257,9 @@ void LLIncomingCallDialog::processCallResponse(S32 response)
bool inviteUserResponse(const LLSD& notification, const LLSD& response)
{
+ if (!gIMMgr)
+ return false;
+
const LLSD& payload = notification["payload"];
LLUUID session_id = payload["session_id"].asUUID();
EInstantMessage type = (EInstantMessage)payload["type"].asInteger();