livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

master
James Cook 2009-12-30 15:47:30 -08:00
parent 4e901957f9 5c0ac6f4ae
commit baa79ad5ee
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llsidepaneliteminfo.cpp
View File

@ -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",

3
indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
View File

@ -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">