diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 10:13:24 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 10:13:24 -0800 |
| commit | f38fa6a7357a91fcede3713cfce4971f0b0d5dfa (patch) | |
| tree | 07ccb7b989cce22cfae95841802fc74d0749c040 /indra/newview/llimview.cpp | |
| parent | f009fbcb03e7d4e87d41f60e2873ffcbcb02354b (diff) | |
| parent | 8758fac7124ff07f2a003bf5719c19a4dab170b9 (diff) | |
PE merge.
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(); |