Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 0a01e23..19b646c 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -887,10 +887,12 @@ bool LLViewerRegion::isAlive()
 
 BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
 {
-        if (mParcelOverlay)
+        if (mParcelOverlay && !gDisconnected)
         {
                 return mParcelOverlay->isOwnedSelf(pos);
-        } else {
+        } 
+        else 
+        {
                 return FALSE;
         }
 }