diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-18 15:39:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-18 15:39:58 -0400 |
| commit | 24524bee426dde1b77f0c23dd5aa1346e1286092 (patch) | |
| tree | b8586bb0e38d7436b7fbd2ce24c0700c5d507c0e /indra/newview/llappviewer.cpp | |
| parent | 9e3c1f59d93a64b0ed63baeea55ba0a965876dbb (diff) | |
| parent | 1b7316c7e4949385f801584cabb1437367860984 (diff) | |
merge changes for storm-1516
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 92e0513464..862fc49c0e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4504,7 +4504,7 @@ void LLAppViewer::idleShutdown() void LLAppViewer::sendLogoutRequest() { - if(!mLogoutRequestSent) + if(!mLogoutRequestSent && gMessageSystem) { LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_LogoutRequest); |