diff options
| author | James Cook <james@cookmd.com> | 2009-12-30 15:47:30 -0800 |
|---|---|---|
| committer | James Cook <james@cookmd.com> | 2009-12-30 15:47:30 -0800 |
| commit | baa79ad5eeacebb8e32b4852b9c10da462014e94 (patch) | |
| tree | 3ee5c7151ef905cf170822f4648422d1c869e085 | |
| parent | 4e901957f9414284fa26ca70122f952243e4122c (diff) | |
| parent | 5c0ac6f4ae267d402733d3c2f30342a8aef48d4c (diff) | |
merge
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_prim_media_controls.xml | 3 |
2 files changed, 8 insertions, 3 deletions
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", 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"> |