diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-07-11 14:23:33 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-07-11 14:23:33 -0600 |
| commit | 8fc13358942b61d8c4f8101ba8face75e984c6b4 (patch) | |
| tree | e1ca7d3cac30ebc704df61d82143205b7e6f5249 /indra/newview/llappviewer.cpp | |
| parent | c94bc42892610c905942c73d960e9d186da640e5 (diff) | |
| parent | 90ceac118cc8f437587d33ba95b10aae84a5ecac (diff) | |
Automated merge with https://bitbucket.org/squire_linden/viewer-development-crash-horde
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 1d9519d675..7e0f042a44 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4513,7 +4513,7 @@ void LLAppViewer::idleShutdown() void LLAppViewer::sendLogoutRequest() { - if(!mLogoutRequestSent) + if(!mLogoutRequestSent && gMessageSystem) { LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_LogoutRequest); |