From 322b5869be76d089187f7a9711273c5fdafe2fe3 Mon Sep 17 00:00:00 2001
From: "Eric M. Tulla (BigPapi)" <tulla@lindenlab.com>
Date: Wed, 30 Dec 2009 16:35:11 -0500
Subject: EXT-2224 - Inv item property fields were still editable if item was
 deleted -Reviewed by seraph

---
 indra/newview/llsidepaneliteminfo.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 1965e634b6..814508daa9 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -168,11 +168,13 @@ void LLSidepanelItemInfo::refresh()
 		if (getIsEditing())
 		{
 			setIsEditing(FALSE);
-			return;
 		}
 	}
+	
+	const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+	bool is_editable = item && (item->getUUID() != trash_id) && !gInventory.isObjectDescendentOf(item->getUUID(), trash_id);
 
-	if (!getIsEditing() || !item)
+	if (!getIsEditing() || !is_editable)
 	{
 		const std::string no_item_names[]={
 			"LabelItemName",
@@ -210,7 +212,7 @@ void LLSidepanelItemInfo::refresh()
 		}
 	}
 
-	if (!item)
+	if (!is_editable)
 	{
 		const std::string no_edit_mode_names[]={
 			"BtnCreator",
-- 
cgit v1.2.3


From 8d5532e78e420f4011fd0e9637c6d5371750fcd3 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 30 Dec 2009 14:47:39 -0800
Subject: EXT-3662 - DEV-44129 Cannot click directly above the media controls
 Reviewed by CB

---
 indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 97790535d0..677d0de243 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -29,12 +29,14 @@
 	  height="75"
 	  layout="topleft"
 	  left="0"
+	  mouse_opaque="false"
 	  orientation="horizontal"
 	  top="100">
 	<!-- outer layout_panels center the inner one -->
 	<layout_panel
 		name="left_bookend"
 		width="0"
+	  mouse_opaque="false"
 		layout="topleft"
 		user_resize="false" />
 	<layout_panel
@@ -42,6 +44,7 @@
 		auto_resize="false"
 		user_resize="false"
 		layout="topleft"
+	  mouse_opaque="false"
 		min_width="22"
 		width="22"
 		top="4">
-- 
cgit v1.2.3