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

Merge with tip

master
Callum Prentice 2009-12-30 14:49:34 -08:00
parent 8d5532e78e 11086c0636
commit 5c0ac6f4ae
1 changed files with 5 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",