diff options
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index f90d6d5b3f..ef7986603b 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -129,7 +129,6 @@ public: virtual void navigateToFolder(bool new_window = false, bool change_mode = false) {} virtual bool isItemRenameable() const; virtual bool renameItem(const std::string& new_name); - virtual bool isFavorite() const { return false; } virtual bool isItemMovable() const; virtual bool isItemRemovable(bool check_worn = true) const; virtual bool removeItem(); @@ -1365,23 +1364,7 @@ bool LLPanelObjectInventory::postBuild() void LLPanelObjectInventory::doToSelected(const LLSD& userdata) { - std::string action = userdata.asString(); - if ("rename" == action || "delete" == action) - { - LLViewerObject* objectp = gObjectList.findObject(mTaskUUID); - if (objectp && !objectp->permModify()) - { - LLNotificationsUtil::add("CantModifyContentInNoModTask"); - } - else - { - LLInventoryAction::doToSelected(&gInventory, mFolders, action); - } - } - else - { - LLInventoryAction::doToSelected(&gInventory, mFolders, action); - } + LLInventoryAction::doToSelected(&gInventory, mFolders, userdata.asString()); } void LLPanelObjectInventory::clearContents() |