diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 11:48:55 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 11:48:55 -0500 |
| commit | 045e3e06579d533619208fb415399e68714244e3 (patch) | |
| tree | 96c064a703b9f606151e699ae2f537cfeae14e48 /indra/newview/llsidepaneliteminfo.cpp | |
| parent | 88b73b1146e39cc9fe150fe82870c811545a507a (diff) | |
EXT-3199 : Re-enable task inspection inventory sidepanel
Re-added the task sidepanel.
Fixed bottom button layout.
Edit mode now always returns true for inventory sidepanels.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.cpp')
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index 25518d87d6..1965e634b6 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -172,7 +172,7 @@ void LLSidepanelItemInfo::refresh() } } - if (!getIsEditing()) + if (!getIsEditing() || !item) { const std::string no_item_names[]={ "LabelItemName", @@ -261,18 +261,6 @@ void LLSidepanelItemInfo::refreshFromItem(LLInventoryItem* item) GP_OBJECT_MANIPULATE) && is_obj_modify && is_complete; - const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); - bool item_in_trash = item->getUUID() == trash_id || gInventory.isObjectDescendentOf(item->getUUID(), trash_id); - - if (is_modifiable && !item_in_trash) - { - setIsEditing(TRUE); - } - else - { - setIsEditing(FALSE); - } - childSetEnabled("LabelItemNameTitle",TRUE); childSetEnabled("LabelItemName",is_modifiable && !is_calling_card); // for now, don't allow rename of calling cards childSetText("LabelItemName",item->getName()); |