-- 
cgit v1.1

From 06a08bbd9505f0f2334dd42695243bafdee8b71a Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sun, 4 Oct 2009 22:03:58 +0200
Subject: test this as a fix for logout crash #2

	modified:   linden/indra/newview/llviewermenu.cpp
	modified:   linden/indra/newview/llviewerregion.cpp
---
 linden/indra/newview/llviewermenu.cpp   | 3 ++-
 linden/indra/newview/llviewerregion.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index ba24c16..0e9e3d9 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -6285,6 +6285,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());
 
@@ -6335,7 +6337,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 1c527e0..d7f1c80 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -906,10 +906,12 @@ bool LLViewerRegion::isAlive()
 
 BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
 {
-	if (mParcelOverlay)
+	if (mParcelOverlay && !gDisconnected)
 	{
 		return mParcelOverlay->isOwnedSelf(pos);
-	} else {
+	} 
+	else 
+	{
 		return FALSE;
 	}
 }
-- 
cgit v1.1


From 92046e276e55b45ec281f1637a18fa176ed21587 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sun, 4 Oct 2009 22:59:14 +0200
Subject: er ... offtopic: add ctrl-alt-shift-d as shortcut to toggle advanced
 for linux because ctrl-alt-d is minimize all windows

	modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
---
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 9da0ec5..1a486e4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -421,6 +421,10 @@
       <on_click function="View.ToggleAdvanced" userdata="" />
       <on_check function="View.CheckAdvanced" />
     </menu_item_check>
+    <menu_item_check  shortcut="control|alt|shift|D">
+	    <on_click function="View.ToggleAdvanced" userdata="" />
+	    <on_check function="View.CheckAdvanced" />
+    </menu_item_check>
   </menu>
 
 
-- 
cgit v1.1