diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-20 17:12:30 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-20 17:12:30 +0200 |
| commit | f4b8822aca5aeebaed56b4bfa3b762b3aa7d0640 (patch) | |
| tree | 698944df6f944aa50ab446be91381f6789f6acb7 /indra/newview/llimview.cpp | |
| parent | 086135b6849bad2e3a5ddcf9bb9540fdb6fb72dd (diff) | |
| parent | f2af69c993190fcac87b91e299321fea9751444d (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 3 |
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(); |