Merge branch '1.2.0-logoutbugs' into next

2 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 55cc2a6..ceb5d5f 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -6334,6 +6334,8 @@ class LLAttachmentEnableDrop : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+                if (gDisconnected)
+                        return true;
                 LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                 BOOL can_build   = gAgent.isGodlike() || (parcel && parcel->getAllowModify());
 
@@ -6384,7 +6386,6 @@ class LLAttachmentEnableDrop : public view_listener_t
 // [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
                 bool new_value = enable_detach(NULL) && can_build && item && (!gRlvHandler.hasBehaviour(RLV_BHVR_REZ));
 // [/RLVa:KB]
-
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 0ba0879..2179c0b 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -917,10 +917,12 @@ bool LLViewerRegion::isAlive()
 
 BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
 {
-        if (mParcelOverlay)
+        if (mParcelOverlay && !gDisconnected)
         {
                 return mParcelOverlay->isOwnedSelf(pos);
-        } else {
+        } 
+        else 
+        {
                 return FALSE;
         }
 }