diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-20 16:29:12 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-20 16:29:12 +0200 |
| commit | f2af69c993190fcac87b91e299321fea9751444d (patch) | |
| tree | ef16fa7c6c6e8af6a6ca712f70ab516d51154949 /indra/newview | |
| parent | 3324c736d7df4035bc73b5f27c8eea756ff43234 (diff) | |
| parent | a719c3631a06169c4cd1caca9a35ba5f2edc7981 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -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(); |