diff options
author | Armin Weatherwax | 2009-10-04 22:03:58 +0200 |
---|---|---|
committer | Armin Weatherwax | 2009-10-04 22:03:58 +0200 |
commit | 06a08bbd9505f0f2334dd42695243bafdee8b71a (patch) | |
tree | eb8b5b6a0366214af06ee2adf1c557baec93d8a1 /linden/indra/newview/llviewerregion.cpp | |
parent | Imprudence 1.2.0 beta released. (diff) | |
download | meta-impy-06a08bbd9505f0f2334dd42695243bafdee8b71a.zip meta-impy-06a08bbd9505f0f2334dd42695243bafdee8b71a.tar.gz meta-impy-06a08bbd9505f0f2334dd42695243bafdee8b71a.tar.bz2 meta-impy-06a08bbd9505f0f2334dd42695243bafdee8b71a.tar.xz |
test this as a fix for logout crash #2
modified: linden/indra/newview/llviewermenu.cpp
modified: linden/indra/newview/llviewerregion.cpp
Diffstat (limited to 'linden/indra/newview/llviewerregion.cpp')
-rw-r--r-- | linden/indra/newview/llviewerregion.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp index 1c527e0..d7f1c80 100644 --- a/linden/indra/newview/llviewerregion.cpp +++ b/linden/indra/newview/llviewerregion.cpp | |||
@@ -906,10 +906,12 @@ bool LLViewerRegion::isAlive() | |||
906 | 906 | ||
907 | BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos) | 907 | BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos) |
908 | { | 908 | { |
909 | if (mParcelOverlay) | 909 | if (mParcelOverlay && !gDisconnected) |
910 | { | 910 | { |
911 | return mParcelOverlay->isOwnedSelf(pos); | 911 | return mParcelOverlay->isOwnedSelf(pos); |
912 | } else { | 912 | } |
913 | else | ||
914 | { | ||
913 | return FALSE; | 915 | return FALSE; |
914 | } | 916 | } |
915 | } | 917 | } |