diff options
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 2580 |
1 files changed, 1273 insertions, 1307 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index f3a41f2e25..ef7986603b 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -5,21 +5,21 @@ * $LicenseInfo:firstyear=2002&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -77,365 +77,359 @@ const LLColor4U DEFAULT_WHITE(255, 255, 255); class LLTaskInvFVBridge : public LLFolderViewModelItemInventory { protected: - LLUUID mUUID; - std::string mName; - mutable std::string mDisplayName; - mutable std::string mSearchableName; - LLPanelObjectInventory* mPanel; - U32 mFlags; - LLAssetType::EType mAssetType; - LLInventoryType::EType mInventoryType; - - LLInventoryObject* findInvObject() const; - LLInventoryItem* findItem() const; + LLUUID mUUID; + std::string mName; + mutable std::string mDisplayName; + mutable std::string mSearchableName; + LLPanelObjectInventory* mPanel; + U32 mFlags; + LLAssetType::EType mAssetType; + LLInventoryType::EType mInventoryType; + + LLInventoryObject* findInvObject() const; + LLInventoryItem* findItem() const; public: - LLTaskInvFVBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name, - U32 flags=0); - virtual ~LLTaskInvFVBridge() {} + LLTaskInvFVBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name, + U32 flags=0); + virtual ~LLTaskInvFVBridge() {} - virtual LLFontGL::StyleFlags getLabelStyle() const { return LLFontGL::NORMAL; } - virtual std::string getLabelSuffix() const { return LLStringUtil::null; } + virtual LLFontGL::StyleFlags getLabelStyle() const { return LLFontGL::NORMAL; } + virtual std::string getLabelSuffix() const { return LLStringUtil::null; } - static LLTaskInvFVBridge* createObjectBridge(LLPanelObjectInventory* panel, - LLInventoryObject* object); - void showProperties(); - S32 getPrice(); + static LLTaskInvFVBridge* createObjectBridge(LLPanelObjectInventory* panel, + LLInventoryObject* object); + void showProperties(); + S32 getPrice(); - // LLFolderViewModelItemInventory functionality - virtual const std::string& getName() const; - virtual const std::string& getDisplayName() const; - virtual const std::string& getSearchableName() const; + // LLFolderViewModelItemInventory functionality + virtual const std::string& getName() const; + virtual const std::string& getDisplayName() const; + virtual const std::string& getSearchableName() const; - virtual std::string getSearchableDescription() const {return LLStringUtil::null;} - virtual std::string getSearchableCreatorName() const {return LLStringUtil::null;} - virtual std::string getSearchableUUIDString() const {return LLStringUtil::null;} + virtual std::string getSearchableDescription() const {return LLStringUtil::null;} + virtual std::string getSearchableCreatorName() const {return LLStringUtil::null;} + virtual std::string getSearchableUUIDString() const {return LLStringUtil::null;} - virtual PermissionMask getPermissionMask() const { return PERM_NONE; } - /*virtual*/ LLFolderType::EType getPreferredType() const { return LLFolderType::FT_NONE; } - virtual const LLUUID& getUUID() const { return mUUID; } + virtual PermissionMask getPermissionMask() const { return PERM_NONE; } + /*virtual*/ LLFolderType::EType getPreferredType() const { return LLFolderType::FT_NONE; } + virtual const LLUUID& getUUID() const { return mUUID; } virtual const LLUUID& getThumbnailUUID() const { return LLUUID::null;} - virtual time_t getCreationDate() const; - virtual void setCreationDate(time_t creation_date_utc); - - virtual LLUIImagePtr getIcon() const; - virtual void openItem(); - virtual BOOL canOpenItem() const { return FALSE; } - virtual void closeItem() {} - virtual void selectItem() {} + virtual time_t getCreationDate() const; + virtual void setCreationDate(time_t creation_date_utc); + + virtual LLUIImagePtr getIcon() const; + virtual void openItem(); + virtual bool canOpenItem() const { return false; } + virtual void closeItem() {} + virtual void selectItem() {} 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 isItemMovable() const; - virtual BOOL isItemRemovable() const; - virtual BOOL removeItem(); - virtual void removeBatch(std::vector<LLFolderViewModelItem*>& batch); - virtual void move(LLFolderViewModelItem* parent_listener); + virtual bool isItemRenameable() const; + virtual bool renameItem(const std::string& new_name); + virtual bool isItemMovable() const; + virtual bool isItemRemovable(bool check_worn = true) const; + virtual bool removeItem(); + virtual void removeBatch(std::vector<LLFolderViewModelItem*>& batch); + virtual void move(LLFolderViewModelItem* parent_listener); virtual bool isItemCopyable(bool can_copy_as_link = true) const; - virtual BOOL copyToClipboard() const; - virtual BOOL cutToClipboard(); - virtual BOOL isClipboardPasteable() const; - virtual void pasteFromClipboard(); - virtual void pasteLinkFromClipboard(); - virtual void buildContextMenu(LLMenuGL& menu, U32 flags); - virtual void performAction(LLInventoryModel* model, std::string action); - virtual BOOL isUpToDate() const { return TRUE; } - virtual bool hasChildren() const { return FALSE; } - virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; } - virtual LLWearableType::EType getWearableType() const { return LLWearableType::WT_NONE; } + virtual bool copyToClipboard() const; + virtual bool cutToClipboard(); + virtual bool isClipboardPasteable() const; + virtual void pasteFromClipboard(); + virtual void pasteLinkFromClipboard(); + virtual void buildContextMenu(LLMenuGL& menu, U32 flags); + virtual void performAction(LLInventoryModel* model, std::string action); + virtual bool isUpToDate() const { return true; } + virtual bool hasChildren() const { return false; } + virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; } + virtual LLWearableType::EType getWearableType() const { return LLWearableType::WT_NONE; } virtual LLSettingsType::type_e getSettingsType() const { return LLSettingsType::ST_NONE; } - virtual EInventorySortGroup getSortGroup() const { return SG_ITEM; } - virtual LLInventoryObject* getInventoryObject() const { return findInvObject(); } + virtual EInventorySortGroup getSortGroup() const { return SG_ITEM; } + virtual LLInventoryObject* getInventoryObject() const { return findInvObject(); } - // LLDragAndDropBridge functionality - virtual LLToolDragAndDrop::ESource getDragSource() const { return LLToolDragAndDrop::SOURCE_WORLD; } - virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const; - virtual BOOL dragOrDrop(MASK mask, BOOL drop, - EDragAndDropType cargo_type, - void* cargo_data, - std::string& tooltip_msg); + // LLDragAndDropBridge functionality + virtual LLToolDragAndDrop::ESource getDragSource() const { return LLToolDragAndDrop::SOURCE_WORLD; } + virtual bool startDrag(EDragAndDropType* type, LLUUID* id) const; + virtual bool dragOrDrop(MASK mask, bool drop, + EDragAndDropType cargo_type, + void* cargo_data, + std::string& tooltip_msg); }; LLTaskInvFVBridge::LLTaskInvFVBridge( - LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name, - U32 flags) -: LLFolderViewModelItemInventory(panel->getRootViewModel()), - mUUID(uuid), - mName(name), - mPanel(panel), - mFlags(flags), - mAssetType(LLAssetType::AT_NONE), - mInventoryType(LLInventoryType::IT_NONE) -{ - const LLInventoryItem *item = findItem(); - if (item) - { - mAssetType = item->getType(); - mInventoryType = item->getInventoryType(); - } + LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name, + U32 flags) +: LLFolderViewModelItemInventory(panel->getRootViewModel()), + mUUID(uuid), + mName(name), + mPanel(panel), + mFlags(flags), + mAssetType(LLAssetType::AT_NONE), + mInventoryType(LLInventoryType::IT_NONE) +{ + if (const LLInventoryItem* item = findItem()) + { + mAssetType = item->getType(); + mInventoryType = item->getInventoryType(); + } } LLInventoryObject* LLTaskInvFVBridge::findInvObject() const { - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if (object) - { - return object->getInventoryObject(mUUID); - } - return NULL; -} + const LLUUID& id = mPanel->getTaskUUID(); + if (LLViewerObject* object = gObjectList.findObject(id)) + { + return object->getInventoryObject(mUUID); + } + return NULL; +} LLInventoryItem* LLTaskInvFVBridge::findItem() const { - return dynamic_cast<LLInventoryItem*>(findInvObject()); + return dynamic_cast<LLInventoryItem*>(findInvObject()); } void LLTaskInvFVBridge::showProperties() { - show_task_item_profile(mUUID, mPanel->getTaskUUID()); + show_task_item_profile(mUUID, mPanel->getTaskUUID()); } S32 LLTaskInvFVBridge::getPrice() { - LLInventoryItem* item = findItem(); - if(item) - { - return item->getSaleInfo().getSalePrice(); - } - else - { - return -1; - } + if (LLInventoryItem* item = findItem()) + { + return item->getSaleInfo().getSalePrice(); + } + + return -1; } +// virtual const std::string& LLTaskInvFVBridge::getName() const { - return mName; + return mName; } +// virtual const std::string& LLTaskInvFVBridge::getDisplayName() const { - LLInventoryItem* item = findItem(); - - if(item) - { - mDisplayName.assign(item->getName()); + if (LLInventoryItem* item = findItem()) + { + mDisplayName.assign(item->getName()); - // Localize "New Script", "New Script 1", "New Script 2", etc. - if (item->getType() == LLAssetType::AT_LSL_TEXT && - LLStringUtil::startsWith(item->getName(), "New Script")) - { - LLStringUtil::replaceString(mDisplayName, "New Script", LLTrans::getString("PanelContentsNewScript")); - } + // Localize "New Script", "New Script 1", "New Script 2", etc. + if (item->getType() == LLAssetType::AT_LSL_TEXT && + LLStringUtil::startsWith(item->getName(), "New Script")) + { + LLStringUtil::replaceString(mDisplayName, "New Script", LLTrans::getString("PanelContentsNewScript")); + } - const LLPermissions& perm(item->getPermissions()); - BOOL copy = gAgent.allowOperation(PERM_COPY, perm, GP_OBJECT_MANIPULATE); - BOOL mod = gAgent.allowOperation(PERM_MODIFY, perm, GP_OBJECT_MANIPULATE); - BOOL xfer = gAgent.allowOperation(PERM_TRANSFER, perm, GP_OBJECT_MANIPULATE); + const LLPermissions& perm(item->getPermissions()); + bool copy = gAgent.allowOperation(PERM_COPY, perm, GP_OBJECT_MANIPULATE); + bool mod = gAgent.allowOperation(PERM_MODIFY, perm, GP_OBJECT_MANIPULATE); + bool xfer = gAgent.allowOperation(PERM_TRANSFER, perm, GP_OBJECT_MANIPULATE); - if(!copy) - { - mDisplayName.append(LLTrans::getString("no_copy")); - } - if(!mod) - { - mDisplayName.append(LLTrans::getString("no_modify")); - } - if(!xfer) - { - mDisplayName.append(LLTrans::getString("no_transfer")); - } - } + if (!copy) + { + mDisplayName.append(LLTrans::getString("no_copy")); + } + if (!mod) + { + mDisplayName.append(LLTrans::getString("no_modify")); + } + if (!xfer) + { + mDisplayName.append(LLTrans::getString("no_transfer")); + } + } - mSearchableName.assign(mDisplayName + getLabelSuffix()); + mSearchableName.assign(mDisplayName + getLabelSuffix()); + LLStringUtil::toUpper(mSearchableName); - return mDisplayName; + return mDisplayName; } +// virtual const std::string& LLTaskInvFVBridge::getSearchableName() const { - return mSearchableName; + return mSearchableName; } - // BUG: No creation dates for task inventory time_t LLTaskInvFVBridge::getCreationDate() const { - return 0; + return 0; } void LLTaskInvFVBridge::setCreationDate(time_t creation_date_utc) -{} - +{ +} LLUIImagePtr LLTaskInvFVBridge::getIcon() const { - const BOOL item_is_multi = (mFlags & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS); + const bool item_is_multi = mFlags & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS; - return LLInventoryIcon::getIcon(mAssetType, mInventoryType, 0, item_is_multi ); + return LLInventoryIcon::getIcon(mAssetType, mInventoryType, 0, item_is_multi); } void LLTaskInvFVBridge::openItem() { - // no-op. - LL_DEBUGS() << "LLTaskInvFVBridge::openItem()" << LL_ENDL; -} - -BOOL LLTaskInvFVBridge::isItemRenameable() const -{ - if(gAgent.isGodlike()) return TRUE; - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(object) - { - LLInventoryItem* item = (LLInventoryItem*)(object->getInventoryObject(mUUID)); - if(item && gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), - GP_OBJECT_MANIPULATE, GOD_LIKE)) - { - return TRUE; - } - } - return FALSE; -} - -BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name) -{ - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(object) - { - LLViewerInventoryItem* item = NULL; - item = (LLViewerInventoryItem*)object->getInventoryObject(mUUID); - if(item && (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), - GP_OBJECT_MANIPULATE, GOD_LIKE))) - { - LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item); - new_item->rename(new_name); - object->updateInventory( - new_item, - TASK_INVENTORY_ITEM_KEY, - false); - } - } - return TRUE; -} - -BOOL LLTaskInvFVBridge::isItemMovable() const -{ - //LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - //if(object && (object->permModify() || gAgent.isGodlike())) - //{ - // return TRUE; - //} - //return FALSE; - return TRUE; -} - -BOOL LLTaskInvFVBridge::isItemRemovable() const -{ - const LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(object - && (object->permModify() || object->permYouOwner())) - { - return TRUE; - } - return FALSE; + // no-op. + LL_DEBUGS() << "LLTaskInvFVBridge::openItem()" << LL_ENDL; +} + +bool LLTaskInvFVBridge::isItemRenameable() const +{ + if (gAgent.isGodlike()) + return true; + + if (LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID())) + { + if (LLInventoryItem* item = (LLInventoryItem*)(object->getInventoryObject(mUUID))) + { + if (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE, GOD_LIKE)) + { + return true; + } + } + } + + return false; +} + +bool LLTaskInvFVBridge::renameItem(const std::string& new_name) +{ + if (LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID())) + { + if (LLViewerInventoryItem* item = (LLViewerInventoryItem*)object->getInventoryObject(mUUID)) + { + if (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE, GOD_LIKE)) + { + LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item); + new_item->rename(new_name); + object->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, false); + } + } + } + + return true; +} + +bool LLTaskInvFVBridge::isItemMovable() const +{ + //LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); + //if(object && (object->permModify() || gAgent.isGodlike())) + //{ + // return true; + //} + //return false; + return true; +} + +bool LLTaskInvFVBridge::isItemRemovable(bool check_worn) const +{ + if (const LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID())) + { + return object->permModify() || object->permYouOwner(); + } + + return false; } bool remove_task_inventory_callback(const LLSD& notification, const LLSD& response, LLPanelObjectInventory* panel) { - S32 option = LLNotificationsUtil::getSelectedOption(notification, response); - LLViewerObject* object = gObjectList.findObject(notification["payload"]["task_id"].asUUID()); - if(option == 0 && object) - { - // yes - LLSD::array_const_iterator list_end = notification["payload"]["inventory_ids"].endArray(); - for (LLSD::array_const_iterator list_it = notification["payload"]["inventory_ids"].beginArray(); - list_it != list_end; - ++list_it) - { - object->removeInventory(list_it->asUUID()); - } - - // refresh the UI. - panel->refresh(); - } - return false; + S32 option = LLNotificationsUtil::getSelectedOption(notification, response); + if (option == 0) + { + if (LLViewerObject* object = gObjectList.findObject(notification["payload"]["task_id"].asUUID())) + { + // yes + const LLSD& inventory_ids = notification["payload"]["inventory_ids"]; + LLSD::array_const_iterator list_it = inventory_ids.beginArray(); + LLSD::array_const_iterator list_end = inventory_ids.endArray(); + for (; list_it != list_end; ++list_it) + { + object->removeInventory(list_it->asUUID()); + } + + // refresh the UI. + panel->refresh(); + } + } + + return false; } // helper for remove // ! REFACTOR ! two_uuids_list_t is also defined in llinventorybridge.h, but differently. typedef std::pair<LLUUID, std::list<LLUUID> > panel_two_uuids_list_t; typedef std::pair<LLPanelObjectInventory*, panel_two_uuids_list_t> remove_data_t; -BOOL LLTaskInvFVBridge::removeItem() -{ - if(isItemRemovable() && mPanel) - { - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(object) - { - if(object->permModify()) - { - // just do it. - object->removeInventory(mUUID); - return TRUE; - } - else - { - LLSD payload; - payload["task_id"] = mPanel->getTaskUUID(); - payload["inventory_ids"].append(mUUID); - LLNotificationsUtil::add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); - return FALSE; - } - } - } - return FALSE; -} - -void LLTaskInvFVBridge::removeBatch(std::vector<LLFolderViewModelItem*>& batch) -{ - if (!mPanel) - { - return; - } - - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if (!object) - { - return; - } - - if (!object->permModify()) - { - LLSD payload; - payload["task_id"] = mPanel->getTaskUUID(); - for (S32 i = 0; i < (S32)batch.size(); i++) - { - LLTaskInvFVBridge* itemp = (LLTaskInvFVBridge*)batch[i]; - payload["inventory_ids"].append(itemp->getUUID()); - } - LLNotificationsUtil::add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); - - } - else - { - for (S32 i = 0; i < (S32)batch.size(); i++) - { - LLTaskInvFVBridge* itemp = (LLTaskInvFVBridge*)batch[i]; - - if(itemp->isItemRemovable()) - { - // just do it. - object->removeInventory(itemp->getUUID()); - } - } - } +bool LLTaskInvFVBridge::removeItem() +{ + if (isItemRemovable() && mPanel) + { + if (LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID())) + { + if (object->permModify()) + { + // just do it. + object->removeInventory(mUUID); + return true; + } + + LLSD payload; + payload["task_id"] = mPanel->getTaskUUID(); + payload["inventory_ids"].append(mUUID); + LLNotificationsUtil::add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); + return false; + } + } + + return false; +} + +void LLTaskInvFVBridge::removeBatch(std::vector<LLFolderViewModelItem*>& batch) +{ + if (!mPanel) + { + return; + } + + LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); + if (!object) + { + return; + } + + if (!object->permModify()) + { + LLSD payload; + payload["task_id"] = mPanel->getTaskUUID(); + for (LLFolderViewModelItem* item : batch) + { + payload["inventory_ids"].append(((LLTaskInvFVBridge*)item)->getUUID()); + } + LLNotificationsUtil::add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel)); + } + else + { + for (LLFolderViewModelItem* item : batch) + { + LLTaskInvFVBridge* bridge = (LLTaskInvFVBridge*)item; + if (bridge->isItemRemovable()) + { + // Just do it. + object->removeInventory(bridge->getUUID()); + } + } + } } void LLTaskInvFVBridge::move(LLFolderViewModelItem* parent_listener) @@ -444,25 +438,27 @@ void LLTaskInvFVBridge::move(LLFolderViewModelItem* parent_listener) bool LLTaskInvFVBridge::isItemCopyable(bool can_link) const { - LLInventoryItem* item = findItem(); - if(!item) return false; - return gAgent.allowOperation(PERM_COPY, item->getPermissions(), - GP_OBJECT_MANIPULATE); + if (LLInventoryItem* item = findItem()) + { + return gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE); + } + + return false; } -BOOL LLTaskInvFVBridge::copyToClipboard() const +bool LLTaskInvFVBridge::copyToClipboard() const { - return FALSE; + return false; } -BOOL LLTaskInvFVBridge::cutToClipboard() +bool LLTaskInvFVBridge::cutToClipboard() { - return FALSE; + return false; } -BOOL LLTaskInvFVBridge::isClipboardPasteable() const +bool LLTaskInvFVBridge::isClipboardPasteable() const { - return FALSE; + return false; } void LLTaskInvFVBridge::pasteFromClipboard() @@ -473,101 +469,98 @@ void LLTaskInvFVBridge::pasteLinkFromClipboard() { } -BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const -{ - //LL_INFOS() << "LLTaskInvFVBridge::startDrag()" << LL_ENDL; - if(mPanel) - { - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(object) - { - LLInventoryItem* inv = NULL; - if((inv = (LLInventoryItem*)object->getInventoryObject(mUUID))) - { - const LLPermissions& perm = inv->getPermissions(); - bool can_copy = gAgent.allowOperation(PERM_COPY, perm, - GP_OBJECT_MANIPULATE); - if (object->isAttachment() && !can_copy) - { - //RN: no copy contents of attachments cannot be dragged out - // due to a race condition and possible exploit where - // attached objects do not update their inventory items - // when their contents are manipulated - return FALSE; - } - if((can_copy && perm.allowTransferTo(gAgent.getID())) - || object->permYouOwner()) -// || gAgent.isGodlike()) - - { - *type = LLViewerAssetType::lookupDragAndDropType(inv->getType()); - - *id = inv->getUUID(); - return TRUE; - } - } - } - } - return FALSE; -} - -BOOL LLTaskInvFVBridge::dragOrDrop(MASK mask, BOOL drop, - EDragAndDropType cargo_type, - void* cargo_data, - std::string& tooltip_msg) -{ - //LL_INFOS() << "LLTaskInvFVBridge::dragOrDrop()" << LL_ENDL; - return FALSE; +bool LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const +{ + //LL_INFOS() << "LLTaskInvFVBridge::startDrag()" << LL_ENDL; + if (!mPanel) + return false; + + if (LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID())) + { + if (LLInventoryItem* inv = (LLInventoryItem*)object->getInventoryObject(mUUID)) + { + const LLPermissions& perm = inv->getPermissions(); + bool can_copy = gAgent.allowOperation(PERM_COPY, perm, GP_OBJECT_MANIPULATE); + if (!can_copy && object->isAttachment()) + { + //RN: no copy contents of attachments cannot be dragged out + // due to a race condition and possible exploit where + // attached objects do not update their inventory items + // when their contents are manipulated + return false; + } + + if ((can_copy && perm.allowTransferTo(gAgent.getID())) + || object->permYouOwner()) +// || gAgent.isGodlike()) + { + *type = LLViewerAssetType::lookupDragAndDropType(inv->getType()); + *id = inv->getUUID(); + return true; + } + } + } + + return false; +} + +bool LLTaskInvFVBridge::dragOrDrop(MASK mask, bool drop, + EDragAndDropType cargo_type, + void* cargo_data, + std::string& tooltip_msg) +{ + //LL_INFOS() << "LLTaskInvFVBridge::dragOrDrop()" << LL_ENDL; + return false; } // virtual void LLTaskInvFVBridge::performAction(LLInventoryModel* model, std::string action) { - if (action == "task_open") - { - openItem(); - } - else if (action == "task_properties") - { - showProperties(); - } + if (action == "task_open") + { + openItem(); + } + else if (action == "task_properties") + { + showProperties(); + } } void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { - LLInventoryItem* item = findItem(); - std::vector<std::string> items; - std::vector<std::string> disabled_items; - - if (!item) - { - hide_context_entries(menu, items, disabled_items); - return; - } - - if (canOpenItem()) - { - items.push_back(std::string("Task Open")); - } - items.push_back(std::string("Task Properties")); - if ((flags & FIRST_SELECTED_ITEM) == 0) - { - disabled_items.push_back(std::string("Task Properties")); - } - if(isItemRenameable()) - { - items.push_back(std::string("Task Rename")); - if ((flags & FIRST_SELECTED_ITEM) == 0) - { - disabled_items.push_back(std::string("Task Rename")); - } - } - if(isItemRemovable()) - { - items.push_back(std::string("Task Remove")); - } - - hide_context_entries(menu, items, disabled_items); + LLInventoryItem* item = findItem(); + std::vector<std::string> items; + std::vector<std::string> disabled_items; + + if (!item) + { + hide_context_entries(menu, items, disabled_items); + return; + } + + if (canOpenItem()) + { + items.push_back(std::string("Task Open")); + } + items.push_back(std::string("Task Properties")); + if ((flags & FIRST_SELECTED_ITEM) == 0) + { + disabled_items.push_back(std::string("Task Properties")); + } + if (isItemRenameable()) + { + items.push_back(std::string("Task Rename")); + if ((flags & FIRST_SELECTED_ITEM) == 0) + { + disabled_items.push_back(std::string("Task Rename")); + } + } + if (isItemRemovable()) + { + items.push_back(std::string("Task Remove")); + } + + hide_context_entries(menu, items, disabled_items); } @@ -578,49 +571,48 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags) class LLTaskCategoryBridge : public LLTaskInvFVBridge { public: - LLTaskCategoryBridge( - LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name); - - virtual LLUIImagePtr getIcon() const; - virtual const std::string& getDisplayName() const; - virtual BOOL isItemRenameable() const; - // virtual BOOL isItemCopyable() const { return FALSE; } - virtual BOOL renameItem(const std::string& new_name); - virtual BOOL isItemRemovable() const; - virtual void buildContextMenu(LLMenuGL& menu, U32 flags); - virtual bool hasChildren() const; - virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const; - virtual BOOL dragOrDrop(MASK mask, BOOL drop, - EDragAndDropType cargo_type, - void* cargo_data, - std::string& tooltip_msg); - virtual BOOL canOpenItem() const { return TRUE; } - virtual void openItem(); - virtual EInventorySortGroup getSortGroup() const { return SG_NORMAL_FOLDER; } + LLTaskCategoryBridge( + LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name); + + virtual LLUIImagePtr getIcon() const; + virtual const std::string& getDisplayName() const; + virtual bool isItemRenameable() const { return false; } + // virtual bool isItemCopyable() const { return false; } + virtual bool renameItem(const std::string& new_name) { return false; } + virtual bool isItemRemovable(bool check_worn = true) const { return false; } + virtual void buildContextMenu(LLMenuGL& menu, U32 flags); + virtual bool hasChildren() const; + virtual bool startDrag(EDragAndDropType* type, LLUUID* id) const; + virtual bool dragOrDrop(MASK mask, bool drop, + EDragAndDropType cargo_type, + void* cargo_data, + std::string& tooltip_msg); + virtual bool canOpenItem() const { return true; } + virtual void openItem(); + virtual EInventorySortGroup getSortGroup() const { return SG_NORMAL_FOLDER; } }; LLTaskCategoryBridge::LLTaskCategoryBridge( - LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskInvFVBridge(panel, uuid, name) + LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskInvFVBridge(panel, uuid, name) { } +// virtual LLUIImagePtr LLTaskCategoryBridge::getIcon() const { - return LLUI::getUIImage("Inv_FolderClosed"); + return LLUI::getUIImage("Inv_FolderClosed"); } // virtual const std::string& LLTaskCategoryBridge::getDisplayName() const { - LLInventoryObject* cat = findInvObject(); - - if (cat) - { + if (LLInventoryObject* cat = findInvObject()) + { std::string name = cat->getName(); if (mChildren.size() > 0) { @@ -632,131 +624,121 @@ const std::string& LLTaskCategoryBridge::getDisplayName() const name.append(" " + LLTrans::getString("InventoryItemsCount", args)); } - mDisplayName.assign(name); - } + mDisplayName.assign(name); + LLStringUtil::toUpper(name); + mSearchableName.assign(name); + } - return mDisplayName; + return mDisplayName; } -BOOL LLTaskCategoryBridge::isItemRenameable() const -{ - return FALSE; -} - -BOOL LLTaskCategoryBridge::renameItem(const std::string& new_name) +void LLTaskCategoryBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { - return FALSE; + std::vector<std::string> items; + std::vector<std::string> disabled_items; + hide_context_entries(menu, items, disabled_items); } -BOOL LLTaskCategoryBridge::isItemRemovable() const +// virtual +bool LLTaskCategoryBridge::hasChildren() const { - return FALSE; + // return true if we have or do know know if we have children. + // *FIX: For now, return false - we will know for sure soon enough. + return false; } -void LLTaskCategoryBridge::buildContextMenu(LLMenuGL& menu, U32 flags) +// virtual +void LLTaskCategoryBridge::openItem() { - std::vector<std::string> items; - std::vector<std::string> disabled_items; - hide_context_entries(menu, items, disabled_items); } -bool LLTaskCategoryBridge::hasChildren() const +// virtual +bool LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const { - // return TRUE if we have or do know know if we have children. - // *FIX: For now, return FALSE - we will know for sure soon enough. - return FALSE; + //LL_INFOS() << "LLTaskInvFVBridge::startDrag()" << LL_ENDL; + if (mPanel && mUUID.notNull()) + { + if (LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID())) + { + const LLInventoryObject* cat = object->getInventoryObject(mUUID); + if (cat && move_inv_category_world_to_agent(mUUID, LLUUID::null, false)) + { + *type = LLViewerAssetType::lookupDragAndDropType(cat->getType()); + *id = mUUID; + return true; + } + } + } + return false; } -void LLTaskCategoryBridge::openItem() +// virtual +bool LLTaskCategoryBridge::dragOrDrop(MASK mask, bool drop, + EDragAndDropType cargo_type, + void* cargo_data, + std::string& tooltip_msg) { -} - -BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const -{ - //LL_INFOS() << "LLTaskInvFVBridge::startDrag()" << LL_ENDL; - if(mPanel && mUUID.notNull()) - { - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(object) - { - const LLInventoryObject* cat = object->getInventoryObject(mUUID); - if ( (cat) && (move_inv_category_world_to_agent(mUUID, LLUUID::null, FALSE)) ) - { - *type = LLViewerAssetType::lookupDragAndDropType(cat->getType()); - *id = mUUID; - return TRUE; - } - } - } - return FALSE; -} - -BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop, - EDragAndDropType cargo_type, - void* cargo_data, - std::string& tooltip_msg) -{ - //LL_INFOS() << "LLTaskCategoryBridge::dragOrDrop()" << LL_ENDL; - BOOL accept = FALSE; - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(object) - { - switch(cargo_type) - { - case DAD_CATEGORY: - accept = LLToolDragAndDrop::getInstance()->dadUpdateInventoryCategory(object,drop); - break; - case DAD_TEXTURE: - case DAD_SOUND: - case DAD_LANDMARK: - case DAD_OBJECT: - case DAD_NOTECARD: - case DAD_CLOTHING: - case DAD_BODYPART: - case DAD_ANIMATION: - case DAD_GESTURE: - case DAD_CALLINGCARD: - case DAD_MESH: + //LL_INFOS() << "LLTaskCategoryBridge::dragOrDrop()" << LL_ENDL; + bool accept = false; + LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); + if(object) + { + switch(cargo_type) + { + case DAD_CATEGORY: + accept = LLToolDragAndDrop::getInstance()->dadUpdateInventoryCategory(object,drop); + break; + case DAD_TEXTURE: + case DAD_SOUND: + case DAD_LANDMARK: + case DAD_OBJECT: + case DAD_NOTECARD: + case DAD_CLOTHING: + case DAD_BODYPART: + case DAD_ANIMATION: + case DAD_GESTURE: + case DAD_CALLINGCARD: + case DAD_MESH: case DAD_SETTINGS: case DAD_MATERIAL: - accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data); - if(accept && drop) - { - LLToolDragAndDrop::dropInventory(object, - (LLViewerInventoryItem*)cargo_data, - LLToolDragAndDrop::getInstance()->getSource(), - LLToolDragAndDrop::getInstance()->getSourceID()); - } - break; - case DAD_SCRIPT: - // *HACK: In order to resolve SL-22177, we need to block - // drags from notecards and objects onto other - // objects. uncomment the simpler version when we have - // that right. - //accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data); - if(LLToolDragAndDrop::isInventoryDropAcceptable( - object, (LLViewerInventoryItem*)cargo_data) - && (LLToolDragAndDrop::SOURCE_WORLD != LLToolDragAndDrop::getInstance()->getSource()) - && (LLToolDragAndDrop::SOURCE_NOTECARD != LLToolDragAndDrop::getInstance()->getSource())) - { - accept = TRUE; - } - if(accept && drop) - { - LLViewerInventoryItem* item = (LLViewerInventoryItem*)cargo_data; - // rez in the script active by default, rez in - // inactive if the control key is being held down. - BOOL active = ((mask & MASK_CONTROL) == 0); - LLToolDragAndDrop::dropScript(object, item, active, - LLToolDragAndDrop::getInstance()->getSource(), - LLToolDragAndDrop::getInstance()->getSourceID()); - } - break; - default: - break; - } - } - return accept; + accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data); + if(accept && drop) + { + LLToolDragAndDrop::dropInventory(object, + (LLViewerInventoryItem*)cargo_data, + LLToolDragAndDrop::getInstance()->getSource(), + LLToolDragAndDrop::getInstance()->getSourceID()); + } + break; + case DAD_SCRIPT: + // *HACK: In order to resolve SL-22177, we need to block + // drags from notecards and objects onto other + // objects. uncomment the simpler version when we have + // that right. + //accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data); + if(LLToolDragAndDrop::isInventoryDropAcceptable( + object, (LLViewerInventoryItem*)cargo_data) + && (LLToolDragAndDrop::SOURCE_WORLD != LLToolDragAndDrop::getInstance()->getSource()) + && (LLToolDragAndDrop::SOURCE_NOTECARD != LLToolDragAndDrop::getInstance()->getSource())) + { + accept = true; + } + if(accept && drop) + { + LLViewerInventoryItem* item = (LLViewerInventoryItem*)cargo_data; + // rez in the script active by default, rez in + // inactive if the control key is being held down. + bool active = ((mask & MASK_CONTROL) == 0); + LLToolDragAndDrop::dropScript(object, item, active, + LLToolDragAndDrop::getInstance()->getSource(), + LLToolDragAndDrop::getInstance()->getSourceID()); + } + break; + default: + break; + } + } + return accept; } ///---------------------------------------------------------------------------- @@ -766,28 +748,27 @@ BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop, class LLTaskTextureBridge : public LLTaskInvFVBridge { public: - LLTaskTextureBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskInvFVBridge(panel, uuid, name) {} + LLTaskTextureBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskInvFVBridge(panel, uuid, name) {} - virtual BOOL canOpenItem() const { return TRUE; } - virtual void openItem(); + virtual bool canOpenItem() const { return true; } + virtual void openItem(); }; +// virtual void LLTaskTextureBridge::openItem() { - LL_INFOS() << "LLTaskTextureBridge::openItem()" << LL_ENDL; - LLPreviewTexture* preview = LLFloaterReg::showTypedInstance<LLPreviewTexture>("preview_texture", LLSD(mUUID), TAKE_FOCUS_YES); - if(preview) - { - LLInventoryItem* item = findItem(); - if(item) - { - preview->setAuxItem(item); - } - preview->setObjectID(mPanel->getTaskUUID()); - } + LL_INFOS() << "LLTaskTextureBridge::openItem()" << LL_ENDL; + if (LLPreviewTexture* preview = LLFloaterReg::showTypedInstance<LLPreviewTexture>("preview_texture", LLSD(mUUID), TAKE_FOCUS_YES)) + { + if (LLInventoryItem* item = findItem()) + { + preview->setAuxItem(item); + } + preview->setObjectID(mPanel->getTaskUUID()); + } } @@ -798,86 +779,88 @@ void LLTaskTextureBridge::openItem() class LLTaskSoundBridge : public LLTaskInvFVBridge { public: - LLTaskSoundBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskInvFVBridge(panel, uuid, name) {} - - virtual BOOL canOpenItem() const { return TRUE; } - virtual void openItem(); - virtual void performAction(LLInventoryModel* model, std::string action); - virtual void buildContextMenu(LLMenuGL& menu, U32 flags); - static void openSoundPreview(void* data); + LLTaskSoundBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskInvFVBridge(panel, uuid, name) {} + + virtual bool canOpenItem() const { return true; } + virtual void openItem(); + virtual void performAction(LLInventoryModel* model, std::string action); + virtual void buildContextMenu(LLMenuGL& menu, U32 flags); + static void openSoundPreview(void* data); }; +// virtual void LLTaskSoundBridge::openItem() { - openSoundPreview((void*)this); + openSoundPreview((void*)this); } +// static void LLTaskSoundBridge::openSoundPreview(void* data) { - LLTaskSoundBridge* self = (LLTaskSoundBridge*)data; - if(!self) - return; + LLTaskSoundBridge* self = (LLTaskSoundBridge*)data; + if(!self) + return; - LLPreviewSound* preview = LLFloaterReg::showTypedInstance<LLPreviewSound>("preview_sound", LLSD(self->mUUID), TAKE_FOCUS_YES); - if (preview) - { - preview->setObjectID(self->mPanel->getTaskUUID()); - } + LLPreviewSound* preview = LLFloaterReg::showTypedInstance<LLPreviewSound>("preview_sound", LLSD(self->mUUID), TAKE_FOCUS_YES); + if (preview) + { + preview->setObjectID(self->mPanel->getTaskUUID()); + } } // virtual void LLTaskSoundBridge::performAction(LLInventoryModel* model, std::string action) { - if (action == "task_play") - { - LLInventoryItem* item = findItem(); - if(item) - { - send_sound_trigger(item->getAssetUUID(), 1.0); - } - } - LLTaskInvFVBridge::performAction(model, action); + if (action == "task_play") + { + LLInventoryItem* item = findItem(); + if(item) + { + send_sound_trigger(item->getAssetUUID(), 1.0); + } + } + LLTaskInvFVBridge::performAction(model, action); } +// virtual void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { - LLInventoryItem* item = findItem(); - std::vector<std::string> items; - std::vector<std::string> disabled_items; - if (!item) - { - hide_context_entries(menu, items, disabled_items); - return; - } - - if (canOpenItem()) - { - if (!isItemCopyable()) - { - disabled_items.push_back(std::string("Task Open")); - } - } - items.push_back(std::string("Task Properties")); - if ((flags & FIRST_SELECTED_ITEM) == 0) - { - disabled_items.push_back(std::string("Task Properties")); - } - if(isItemRenameable()) - { - items.push_back(std::string("Task Rename")); - } - if(isItemRemovable()) - { - items.push_back(std::string("Task Remove")); - } - - items.push_back(std::string("Task Play")); - - - hide_context_entries(menu, items, disabled_items); + LLInventoryItem* item = findItem(); + std::vector<std::string> items; + std::vector<std::string> disabled_items; + if (!item) + { + hide_context_entries(menu, items, disabled_items); + return; + } + + if (canOpenItem()) + { + if (!isItemCopyable()) + { + disabled_items.push_back(std::string("Task Open")); + } + } + items.push_back(std::string("Task Properties")); + if ((flags & FIRST_SELECTED_ITEM) == 0) + { + disabled_items.push_back(std::string("Task Properties")); + } + if (isItemRenameable()) + { + items.push_back(std::string("Task Rename")); + } + if (isItemRemovable()) + { + items.push_back(std::string("Task Remove")); + } + + items.push_back(std::string("Task Play")); + + hide_context_entries(menu, items, disabled_items); } ///---------------------------------------------------------------------------- @@ -887,10 +870,10 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags) class LLTaskLandmarkBridge : public LLTaskInvFVBridge { public: - LLTaskLandmarkBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskInvFVBridge(panel, uuid, name) {} + LLTaskLandmarkBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskInvFVBridge(panel, uuid, name) {} }; ///---------------------------------------------------------------------------- @@ -900,25 +883,15 @@ public: class LLTaskCallingCardBridge : public LLTaskInvFVBridge { public: - LLTaskCallingCardBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskInvFVBridge(panel, uuid, name) {} + LLTaskCallingCardBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskInvFVBridge(panel, uuid, name) {} - virtual BOOL isItemRenameable() const; - virtual BOOL renameItem(const std::string& new_name); + virtual bool isItemRenameable() const { return false; } + virtual bool renameItem(const std::string& new_name) { return false; } }; -BOOL LLTaskCallingCardBridge::isItemRenameable() const -{ - return FALSE; -} - -BOOL LLTaskCallingCardBridge::renameItem(const std::string& new_name) -{ - return FALSE; -} - ///---------------------------------------------------------------------------- /// Class LLTaskScriptBridge @@ -927,59 +900,67 @@ BOOL LLTaskCallingCardBridge::renameItem(const std::string& new_name) class LLTaskScriptBridge : public LLTaskInvFVBridge { public: - LLTaskScriptBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskInvFVBridge(panel, uuid, name) {} + LLTaskScriptBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskInvFVBridge(panel, uuid, name) {} - //static BOOL enableIfCopyable( void* userdata ); + //static bool enableIfCopyable( void* userdata ); }; class LLTaskLSLBridge : public LLTaskScriptBridge { public: - LLTaskLSLBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskScriptBridge(panel, uuid, name) {} + LLTaskLSLBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskScriptBridge(panel, uuid, name) {} - virtual BOOL canOpenItem() const { return TRUE; } - virtual void openItem(); - virtual BOOL removeItem(); - //virtual void buildContextMenu(LLMenuGL& menu); + virtual bool canOpenItem() const { return true; } + virtual void openItem(); + virtual bool removeItem(); + //virtual void buildContextMenu(LLMenuGL& menu); - //static void copyToInventory(void* userdata); + //static void copyToInventory(void* userdata); }; +// virtual void LLTaskLSLBridge::openItem() { - LL_INFOS() << "LLTaskLSLBridge::openItem() " << mUUID << LL_ENDL; - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(!object || object->isInventoryPending()) - { - return; - } - if (object->permModify() || gAgent.isGodlike()) - { - LLSD floater_key; - floater_key["taskid"] = mPanel->getTaskUUID(); - floater_key["itemid"] = mUUID; - LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", floater_key, TAKE_FOCUS_YES); - if (preview) - { - preview->setObjectID(mPanel->getTaskUUID()); - } - } - else - { - LLNotificationsUtil::add("CannotOpenScriptObjectNoMod"); - } -} - -BOOL LLTaskLSLBridge::removeItem() -{ - LLFloaterReg::hideInstance("preview_scriptedit", LLSD(mUUID)); - return LLTaskInvFVBridge::removeItem(); + LL_INFOS() << "LLTaskLSLBridge::openItem() " << mUUID << LL_ENDL; + LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); + if(!object || object->isInventoryPending()) + { + return; + } + if (object->permModify() || gAgent.isGodlike()) + { + LLSD floater_key; + floater_key["taskid"] = mPanel->getTaskUUID(); + floater_key["itemid"] = mUUID; + + LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", floater_key, TAKE_FOCUS_YES); + if (preview) + { + LLSelectNode *node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, true); + if (node && node->mValid) + { + preview->setObjectName(node->mName); + } + preview->setObjectID(mPanel->getTaskUUID()); + } + } + else + { + LLNotificationsUtil::add("CannotOpenScriptObjectNoMod"); + } +} + +// virtual +bool LLTaskLSLBridge::removeItem() +{ + LLFloaterReg::hideInstance("preview_scriptedit", LLSD(mUUID)); + return LLTaskInvFVBridge::removeItem(); } ///---------------------------------------------------------------------------- @@ -989,11 +970,11 @@ BOOL LLTaskLSLBridge::removeItem() class LLTaskObjectBridge : public LLTaskInvFVBridge { public: - LLTaskObjectBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name, - U32 flags = 0) : - LLTaskInvFVBridge(panel, uuid, name, flags) {} + LLTaskObjectBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name, + U32 flags = 0) : + LLTaskInvFVBridge(panel, uuid, name, flags) {} }; ///---------------------------------------------------------------------------- @@ -1003,46 +984,48 @@ public: class LLTaskNotecardBridge : public LLTaskInvFVBridge { public: - LLTaskNotecardBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskInvFVBridge(panel, uuid, name) {} - - virtual BOOL canOpenItem() const { return TRUE; } - virtual void openItem(); - virtual BOOL removeItem(); + LLTaskNotecardBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskInvFVBridge(panel, uuid, name) {} + + virtual bool canOpenItem() const { return true; } + virtual void openItem(); + virtual bool removeItem(); }; +// virtual void LLTaskNotecardBridge::openItem() { - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(!object || object->isInventoryPending()) - { - return; - } + LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); + if(!object || object->isInventoryPending()) + { + return; + } - // Note: even if we are not allowed to modify copyable notecard, we should be able to view it - LLInventoryItem *item = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID)); - BOOL item_copy = item && gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE); - if( item_copy - || object->permModify() - || gAgent.isGodlike()) - { - LLSD floater_key; - floater_key["taskid"] = mPanel->getTaskUUID(); - floater_key["itemid"] = mUUID; - LLPreviewNotecard* preview = LLFloaterReg::showTypedInstance<LLPreviewNotecard>("preview_notecard", floater_key, TAKE_FOCUS_YES); - if (preview) - { - preview->setObjectID(mPanel->getTaskUUID()); - } - } + // Note: even if we are not allowed to modify copyable notecard, we should be able to view it + LLInventoryItem *item = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID)); + bool item_copy = item && gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE); + if( item_copy + || object->permModify() + || gAgent.isGodlike()) + { + LLSD floater_key; + floater_key["taskid"] = mPanel->getTaskUUID(); + floater_key["itemid"] = mUUID; + LLPreviewNotecard* preview = LLFloaterReg::showTypedInstance<LLPreviewNotecard>("preview_notecard", floater_key, TAKE_FOCUS_YES); + if (preview) + { + preview->setObjectID(mPanel->getTaskUUID()); + } + } } -BOOL LLTaskNotecardBridge::removeItem() +// virtual +bool LLTaskNotecardBridge::removeItem() { - LLFloaterReg::hideInstance("preview_notecard", LLSD(mUUID)); - return LLTaskInvFVBridge::removeItem(); + LLFloaterReg::hideInstance("preview_notecard", LLSD(mUUID)); + return LLTaskInvFVBridge::removeItem(); } ///---------------------------------------------------------------------------- @@ -1052,31 +1035,33 @@ BOOL LLTaskNotecardBridge::removeItem() class LLTaskGestureBridge : public LLTaskInvFVBridge { public: - LLTaskGestureBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskInvFVBridge(panel, uuid, name) {} - - virtual BOOL canOpenItem() const { return TRUE; } - virtual void openItem(); - virtual BOOL removeItem(); + LLTaskGestureBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskInvFVBridge(panel, uuid, name) {} + + virtual bool canOpenItem() const { return true; } + virtual void openItem(); + virtual bool removeItem(); }; +// virtual void LLTaskGestureBridge::openItem() { - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(!object || object->isInventoryPending()) - { - return; - } - LLPreviewGesture::show(mUUID, mPanel->getTaskUUID()); + LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); + if(!object || object->isInventoryPending()) + { + return; + } + LLPreviewGesture::show(mUUID, mPanel->getTaskUUID()); } -BOOL LLTaskGestureBridge::removeItem() +// virtual +bool LLTaskGestureBridge::removeItem() { - // Don't need to deactivate gesture because gestures inside objects can never be active. - LLFloaterReg::hideInstance("preview_gesture", LLSD(mUUID)); - return LLTaskInvFVBridge::removeItem(); + // Don't need to deactivate gesture because gestures inside objects can never be active. + LLFloaterReg::hideInstance("preview_gesture", LLSD(mUUID)); + return LLTaskInvFVBridge::removeItem(); } ///---------------------------------------------------------------------------- @@ -1086,35 +1071,38 @@ BOOL LLTaskGestureBridge::removeItem() class LLTaskAnimationBridge : public LLTaskInvFVBridge { public: - LLTaskAnimationBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name) : - LLTaskInvFVBridge(panel, uuid, name) {} - - virtual BOOL canOpenItem() const { return TRUE; } - virtual void openItem(); - virtual BOOL removeItem(); + LLTaskAnimationBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name) : + LLTaskInvFVBridge(panel, uuid, name) {} + + virtual bool canOpenItem() const { return true; } + virtual void openItem(); + virtual bool removeItem(); }; +// virtual void LLTaskAnimationBridge::openItem() { - LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); - if(!object || object->isInventoryPending()) - { - return; - } + const LLUUID& task_id = mPanel->getTaskUUID(); + LLViewerObject* object = gObjectList.findObject(task_id); + if (!object || object->isInventoryPending()) + { + return; + } - LLPreviewAnim* preview = LLFloaterReg::showTypedInstance<LLPreviewAnim>("preview_anim", LLSD(mUUID), TAKE_FOCUS_YES); - if (preview && (object->permModify() || gAgent.isGodlike())) - { - preview->setObjectID(mPanel->getTaskUUID()); - } + LLPreviewAnim* preview = LLFloaterReg::showTypedInstance<LLPreviewAnim>("preview_anim", LLSD(mUUID), TAKE_FOCUS_YES); + if (preview && (object->permModify() || gAgent.isGodlike())) + { + preview->setObjectID(mPanel->getTaskUUID()); + } } -BOOL LLTaskAnimationBridge::removeItem() +// virtual +bool LLTaskAnimationBridge::removeItem() { - LLFloaterReg::hideInstance("preview_anim", LLSD(mUUID)); - return LLTaskInvFVBridge::removeItem(); + LLFloaterReg::hideInstance("preview_anim", LLSD(mUUID)); + return LLTaskInvFVBridge::removeItem(); } ///---------------------------------------------------------------------------- @@ -1124,18 +1112,19 @@ BOOL LLTaskAnimationBridge::removeItem() class LLTaskWearableBridge : public LLTaskInvFVBridge { public: - LLTaskWearableBridge(LLPanelObjectInventory* panel, - const LLUUID& uuid, - const std::string& name, - U32 flags) : - LLTaskInvFVBridge(panel, uuid, name, flags) {} + LLTaskWearableBridge(LLPanelObjectInventory* panel, + const LLUUID& uuid, + const std::string& name, + U32 flags) : + LLTaskInvFVBridge(panel, uuid, name, flags) {} - virtual LLUIImagePtr getIcon() const; + virtual LLUIImagePtr getIcon() const; }; +// virtual LLUIImagePtr LLTaskWearableBridge::getIcon() const { - return LLInventoryIcon::getIcon(mAssetType, mInventoryType, mFlags, FALSE ); + return LLInventoryIcon::getIcon(mAssetType, mInventoryType, mFlags, false ); } ///---------------------------------------------------------------------------- @@ -1155,14 +1144,16 @@ public: virtual LLSettingsType::type_e getSettingsType() const; }; +// virtual LLUIImagePtr LLTaskSettingsBridge::getIcon() const { - return LLInventoryIcon::getIcon(mAssetType, mInventoryType, mFlags, FALSE); + return LLInventoryIcon::getIcon(mAssetType, mInventoryType, mFlags, false); } -LLSettingsType::type_e LLTaskSettingsBridge::getSettingsType() const -{ - return LLSettingsType::ST_NONE; +// virtual +LLSettingsType::type_e LLTaskSettingsBridge::getSettingsType() const +{ + return LLSettingsType::ST_NONE; } ///---------------------------------------------------------------------------- @@ -1177,11 +1168,12 @@ public: const std::string& name) : LLTaskInvFVBridge(panel, uuid, name) {} - BOOL canOpenItem() const override { return TRUE; } + bool canOpenItem() const override { return true; } void openItem() override; - BOOL removeItem() override; + bool removeItem() override; }; +// virtual void LLTaskMaterialBridge::openItem() { LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); @@ -1192,7 +1184,7 @@ void LLTaskMaterialBridge::openItem() // Note: even if we are not allowed to modify copyable notecard, we should be able to view it LLInventoryItem *item = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID)); - BOOL item_copy = item && gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE); + bool item_copy = item && gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE); if( item_copy || object->permModify() || gAgent.isGodlike()) @@ -1205,116 +1197,116 @@ void LLTaskMaterialBridge::openItem() { mat->setObjectID(mPanel->getTaskUUID()); mat->openFloater(floater_key); - mat->setFocus(TRUE); + mat->setFocus(true); } } } -BOOL LLTaskMaterialBridge::removeItem() +// virtual +bool LLTaskMaterialBridge::removeItem() { LLFloaterReg::hideInstance("material_editor", LLSD(mUUID)); return LLTaskInvFVBridge::removeItem(); } - ///---------------------------------------------------------------------------- /// LLTaskInvFVBridge impl //---------------------------------------------------------------------------- LLTaskInvFVBridge* LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory* panel, - LLInventoryObject* object) -{ - LLTaskInvFVBridge* new_bridge = NULL; - const LLInventoryItem* item = dynamic_cast<LLInventoryItem*>(object); - const U32 itemflags = ( NULL == item ? 0 : item->getFlags() ); - LLAssetType::EType type = object ? object->getType() : LLAssetType::AT_CATEGORY; - LLUUID object_id = object ? object->getUUID() : LLUUID::null; - std::string object_name = object ? object->getName() : std::string(); - - switch(type) - { - case LLAssetType::AT_TEXTURE: - new_bridge = new LLTaskTextureBridge(panel, - object_id, - object_name); - break; - case LLAssetType::AT_SOUND: - new_bridge = new LLTaskSoundBridge(panel, - object_id, - object_name); - break; - case LLAssetType::AT_LANDMARK: - new_bridge = new LLTaskLandmarkBridge(panel, - object_id, - object_name); - break; - case LLAssetType::AT_CALLINGCARD: - new_bridge = new LLTaskCallingCardBridge(panel, - object_id, - object_name); - break; - case LLAssetType::AT_SCRIPT: - // OLD SCRIPTS DEPRECATED - JC - LL_WARNS() << "Old script" << LL_ENDL; - //new_bridge = new LLTaskOldScriptBridge(panel, - // object_id, - // object_name); - break; - case LLAssetType::AT_OBJECT: - new_bridge = new LLTaskObjectBridge(panel, - object_id, - object_name, - itemflags); - break; - case LLAssetType::AT_NOTECARD: - new_bridge = new LLTaskNotecardBridge(panel, - object_id, - object_name); - break; - case LLAssetType::AT_ANIMATION: - new_bridge = new LLTaskAnimationBridge(panel, - object_id, - object_name); - break; - case LLAssetType::AT_GESTURE: - new_bridge = new LLTaskGestureBridge(panel, - object_id, - object_name); - break; - case LLAssetType::AT_CLOTHING: - case LLAssetType::AT_BODYPART: - new_bridge = new LLTaskWearableBridge(panel, - object_id, - object_name, - itemflags); - break; - case LLAssetType::AT_CATEGORY: - new_bridge = new LLTaskCategoryBridge(panel, - object_id, - object_name); - break; - case LLAssetType::AT_LSL_TEXT: - new_bridge = new LLTaskLSLBridge(panel, - object_id, - object_name); - break; - case LLAssetType::AT_SETTINGS: - new_bridge = new LLTaskSettingsBridge(panel, - object_id, - object_name, + LLInventoryObject* object) +{ + LLTaskInvFVBridge* new_bridge = NULL; + const LLInventoryItem* item = dynamic_cast<LLInventoryItem*>(object); + const U32 itemflags = ( NULL == item ? 0 : item->getFlags() ); + LLAssetType::EType type = object ? object->getType() : LLAssetType::AT_CATEGORY; + LLUUID object_id = object ? object->getUUID() : LLUUID::null; + std::string object_name = object ? object->getName() : std::string(); + + switch(type) + { + case LLAssetType::AT_TEXTURE: + new_bridge = new LLTaskTextureBridge(panel, + object_id, + object_name); + break; + case LLAssetType::AT_SOUND: + new_bridge = new LLTaskSoundBridge(panel, + object_id, + object_name); + break; + case LLAssetType::AT_LANDMARK: + new_bridge = new LLTaskLandmarkBridge(panel, + object_id, + object_name); + break; + case LLAssetType::AT_CALLINGCARD: + new_bridge = new LLTaskCallingCardBridge(panel, + object_id, + object_name); + break; + case LLAssetType::AT_SCRIPT: + // OLD SCRIPTS DEPRECATED - JC + LL_WARNS() << "Old script" << LL_ENDL; + //new_bridge = new LLTaskOldScriptBridge(panel, + // object_id, + // object_name); + break; + case LLAssetType::AT_OBJECT: + new_bridge = new LLTaskObjectBridge(panel, + object_id, + object_name, + itemflags); + break; + case LLAssetType::AT_NOTECARD: + new_bridge = new LLTaskNotecardBridge(panel, + object_id, + object_name); + break; + case LLAssetType::AT_ANIMATION: + new_bridge = new LLTaskAnimationBridge(panel, + object_id, + object_name); + break; + case LLAssetType::AT_GESTURE: + new_bridge = new LLTaskGestureBridge(panel, + object_id, + object_name); + break; + case LLAssetType::AT_CLOTHING: + case LLAssetType::AT_BODYPART: + new_bridge = new LLTaskWearableBridge(panel, + object_id, + object_name, + itemflags); + break; + case LLAssetType::AT_CATEGORY: + new_bridge = new LLTaskCategoryBridge(panel, + object_id, + object_name); + break; + case LLAssetType::AT_LSL_TEXT: + new_bridge = new LLTaskLSLBridge(panel, + object_id, + object_name); + break; + case LLAssetType::AT_SETTINGS: + new_bridge = new LLTaskSettingsBridge(panel, + object_id, + object_name, itemflags); - break; + break; case LLAssetType::AT_MATERIAL: new_bridge = new LLTaskMaterialBridge(panel, object_id, object_name); break; - default: - LL_INFOS() << "Unhandled inventory type (llassetstorage.h): " - << (S32)type << LL_ENDL; - break; - } - return new_bridge; + default: + LL_INFOS() << "Unhandled inventory type (llassetstorage.h): " + << (S32)type << LL_ENDL; + break; + } + return new_bridge; } @@ -1330,222 +1322,216 @@ void do_nothing() // Default constructor LLPanelObjectInventory::LLPanelObjectInventory(const LLPanelObjectInventory::Params& p) : - LLPanel(p), - mScroller(NULL), - mFolders(NULL), - mHaveInventory(FALSE), - mIsInventoryEmpty(TRUE), - mInventoryNeedsUpdate(FALSE), - mInventoryViewModel(p.name), + LLPanel(p), + mScroller(NULL), + mFolders(NULL), + mHaveInventory(false), + mIsInventoryEmpty(true), + mInventoryNeedsUpdate(false), + mInventoryViewModel(p.name), mShowRootFolder(p.show_root_folder) { - // Setup context menu callbacks - mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelObjectInventory::doToSelected, this, _2)); - mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH)); - mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND)); - mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&do_nothing)); - mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&do_nothing)); - mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&do_nothing)); - mCommitCallbackRegistrar.add("Inventory.Share", boost::bind(&LLAvatarActions::shareWithAvatars, this)); - mCommitCallbackRegistrar.add("Inventory.FileUploadLocation", boost::bind(&do_nothing)); + // Setup context menu callbacks + mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelObjectInventory::doToSelected, this, _2)); + mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH)); + mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND)); + mCommitCallbackRegistrar.add("Inventory.DoCreate", boost::bind(&do_nothing)); + mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&do_nothing)); + mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&do_nothing)); + mCommitCallbackRegistrar.add("Inventory.Share", boost::bind(&LLAvatarActions::shareWithAvatars, this)); + mCommitCallbackRegistrar.add("Inventory.FileUploadLocation", boost::bind(&do_nothing)); } // Destroys the object LLPanelObjectInventory::~LLPanelObjectInventory() { - if (!gIdleCallbacks.deleteFunction(idle, this)) - { - LL_WARNS() << "LLPanelObjectInventory::~LLPanelObjectInventory() failed to delete callback" << LL_ENDL; - } + if (!gIdleCallbacks.deleteFunction(idle, this)) + { + LL_WARNS() << "LLPanelObjectInventory::~LLPanelObjectInventory() failed to delete callback" << LL_ENDL; + } } -BOOL LLPanelObjectInventory::postBuild() +bool LLPanelObjectInventory::postBuild() { - // clear contents and initialize menus, sets up mFolders - reset(); + // clear contents and initialize menus, sets up mFolders + reset(); - // Register an idle update callback - gIdleCallbacks.addFunction(idle, this); + // Register an idle update callback + gIdleCallbacks.addFunction(idle, this); - return TRUE; + return true; } void LLPanelObjectInventory::doToSelected(const LLSD& userdata) { - LLInventoryAction::doToSelected(&gInventory, mFolders, userdata.asString()); + LLInventoryAction::doToSelected(&gInventory, mFolders, userdata.asString()); } void LLPanelObjectInventory::clearContents() { - mHaveInventory = FALSE; - mIsInventoryEmpty = TRUE; - if (LLToolDragAndDrop::getInstance() && LLToolDragAndDrop::getInstance()->getSource() == LLToolDragAndDrop::SOURCE_WORLD) - { - LLToolDragAndDrop::getInstance()->endDrag(); - } + mHaveInventory = false; + mIsInventoryEmpty = true; + if (LLToolDragAndDrop::getInstance() && LLToolDragAndDrop::getInstance()->getSource() == LLToolDragAndDrop::SOURCE_WORLD) + { + LLToolDragAndDrop::getInstance()->endDrag(); + } - clearItemIDs(); + clearItemIDs(); - if( mScroller ) - { - // removes mFolders - removeChild( mScroller ); //*TODO: Really shouldn't do this during draw()/refresh() - mScroller->die(); - mScroller = NULL; - mFolders = NULL; - } + if( mScroller ) + { + // removes mFolders + removeChild( mScroller ); //*TODO: Really shouldn't do this during draw()/refresh() + mScroller->die(); + mScroller = NULL; + mFolders = NULL; + } } - void LLPanelObjectInventory::reset() { - clearContents(); - - mCommitCallbackRegistrar.pushScope(); // push local callbacks - - // Reset the inventory model to show all folders by default - mInventoryViewModel.getFilter().setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS); - - // Create a new folder view root - LLRect dummy_rect(0, 1, 1, 0); - LLFolderView::Params p; - p.name = "task inventory"; - p.title = "task inventory"; - p.parent_panel = this; - p.tool_tip= LLTrans::getString("PanelContentsTooltip"); - p.listener = LLTaskInvFVBridge::createObjectBridge(this, NULL); - p.folder_indentation = -14; // subtract space normally reserved for folder expanders - p.view_model = &mInventoryViewModel; - p.root = NULL; + clearContents(); + + mCommitCallbackRegistrar.pushScope(); // push local callbacks + + // Reset the inventory model to show all folders by default + mInventoryViewModel.getFilter().setShowFolderState(LLInventoryFilter::SHOW_ALL_FOLDERS); + + // Create a new folder view root + LLRect dummy_rect(0, 1, 1, 0); + LLFolderView::Params p; + p.name = "task inventory"; + p.title = "task inventory"; + p.parent_panel = this; + p.tool_tip= LLTrans::getString("PanelContentsTooltip"); + p.listener = LLTaskInvFVBridge::createObjectBridge(this, NULL); + p.folder_indentation = -14; // subtract space normally reserved for folder expanders + p.view_model = &mInventoryViewModel; + p.root = NULL; p.options_menu = "menu_inventory.xml"; - mFolders = LLUICtrlFactory::create<LLFolderView>(p); + mFolders = LLUICtrlFactory::create<LLFolderView>(p); - mFolders->setCallbackRegistrar(&mCommitCallbackRegistrar); - mFolders->setEnableRegistrar(&mEnableCallbackRegistrar); + mFolders->setCallbackRegistrar(&mCommitCallbackRegistrar); + mFolders->setEnableRegistrar(&mEnableCallbackRegistrar); - if (hasFocus()) - { - LLEditMenuHandler::gEditMenuHandler = mFolders; - } + if (hasFocus()) + { + LLEditMenuHandler::gEditMenuHandler = mFolders; + } - int offset = hasBorder() ? getBorder()->getBorderWidth() << 1 : 0; - LLRect scroller_rect(0, getRect().getHeight() - offset, getRect().getWidth() - offset, 0); - LLScrollContainer::Params scroll_p; - scroll_p.name("task inventory scroller"); - scroll_p.rect(scroller_rect); - scroll_p.tab_stop(true); - scroll_p.follows.flags(FOLLOWS_ALL); - mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroll_p); - addChild(mScroller); - mScroller->addChild(mFolders); - - mFolders->setScrollContainer( mScroller ); - - mCommitCallbackRegistrar.popScope(); + int offset = hasBorder() ? getBorder()->getBorderWidth() << 1 : 0; + LLRect scroller_rect(0, getRect().getHeight() - offset, getRect().getWidth() - offset, 0); + LLScrollContainer::Params scroll_p; + scroll_p.name("task inventory scroller"); + scroll_p.rect(scroller_rect); + scroll_p.tab_stop(true); + scroll_p.follows.flags(FOLLOWS_ALL); + mScroller = LLUICtrlFactory::create<LLFolderViewScrollContainer>(scroll_p); + addChild(mScroller); + mScroller->addChild(mFolders); + + mFolders->setScrollContainer( mScroller ); + + mCommitCallbackRegistrar.popScope(); } void LLPanelObjectInventory::inventoryChanged(LLViewerObject* object, - LLInventoryObject::object_list_t* inventory, - S32 serial_num, - void* data) + LLInventoryObject::object_list_t* inventory, + S32 serial_num, + void* data) { - if(!object) return; + if (!object) + return; - //LL_INFOS() << "invetnory arrived: \n" - // << " panel UUID: " << panel->mTaskUUID << "\n" - // << " task UUID: " << object->mID << LL_ENDL; - if(mTaskUUID == object->mID) - { - mInventoryNeedsUpdate = TRUE; - } + //LL_INFOS() << "invetnory arrived: \n" + // << " panel UUID: " << panel->mTaskUUID << "\n" + // << " task UUID: " << object->mID << LL_ENDL; + if (mTaskUUID == object->mID) + { + mInventoryNeedsUpdate = true; + } } void LLPanelObjectInventory::updateInventory() { - //LL_INFOS() << "inventory arrived: \n" - // << " panel UUID: " << panel->mTaskUUID << "\n" - // << " task UUID: " << object->mID << LL_ENDL; - // We're still interested in this task's inventory. - std::vector<LLUUID> selected_item_ids; - std::set<LLFolderViewItem*> selected_items; - BOOL inventory_has_focus = FALSE; - if (mHaveInventory && mFolders) - { - selected_items = mFolders->getSelectionList(); - inventory_has_focus = gFocusMgr.childHasKeyboardFocus(mFolders); - } - for (std::set<LLFolderViewItem*>::iterator it = selected_items.begin(), end_it = selected_items.end(); - it != end_it; - ++it) - { - selected_item_ids.push_back(static_cast<LLFolderViewModelItemInventory*>((*it)->getViewModelItem())->getUUID()); - } - - LLViewerObject* objectp = gObjectList.findObject(mTaskUUID); - if (objectp) - { - LLInventoryObject* inventory_root = objectp->getInventoryRoot(); - LLInventoryObject::object_list_t contents; - objectp->getInventoryContents(contents); - - if (inventory_root) - { - reset(); - mIsInventoryEmpty = FALSE; - createFolderViews(inventory_root, contents); - mFolders->setEnabled(TRUE); - } - else - { - // TODO: create an empty inventory - mIsInventoryEmpty = TRUE; - } - - mHaveInventory = !mIsInventoryEmpty || !objectp->isInventoryDirty(); - if (objectp->isInventoryDirty()) - { - // Inventory is dirty, yet we received inventoryChanged() callback. - // User changed something during ongoing request. - // Rerequest. It will clear dirty flag and won't create dupplicate requests. - objectp->requestInventory(); - } - } - else - { - // TODO: create an empty inventory - mIsInventoryEmpty = TRUE; - mHaveInventory = TRUE; - } - - // restore previous selection - std::vector<LLUUID>::iterator selection_it; - bool first_item = true; - for (selection_it = selected_item_ids.begin(); selection_it != selected_item_ids.end(); ++selection_it) - { - LLFolderViewItem* selected_item = getItemByID(*selection_it); - - if (selected_item) - { - //HACK: "set" first item then "change" each other one to get keyboard focus right - if (first_item) - { - mFolders->setSelection(selected_item, TRUE, inventory_has_focus); - first_item = FALSE; - } - else - { - mFolders->changeSelection(selected_item, TRUE); - } - } - } - - if (mFolders) - { - mFolders->requestArrange(); - } - mInventoryNeedsUpdate = FALSE; - // Edit menu handler is set in onFocusReceived + //LL_INFOS() << "inventory arrived: \n" + // << " panel UUID: " << panel->mTaskUUID << "\n" + // << " task UUID: " << object->mID << LL_ENDL; + // We're still interested in this task's inventory. + bool inventory_has_focus = mHaveInventory && mFolders && gFocusMgr.childHasKeyboardFocus(mFolders); + + std::vector<LLUUID> selected_item_ids; + if (mHaveInventory && mFolders) + { + std::set<LLFolderViewItem*> selected_items = mFolders->getSelectionList(); + for (LLFolderViewItem* item : selected_items) + { + selected_item_ids.push_back(static_cast<LLFolderViewModelItemInventory*>(item->getViewModelItem())->getUUID()); + } + } + + if (LLViewerObject* objectp = gObjectList.findObject(mTaskUUID)) + { + LLInventoryObject* inventory_root = objectp->getInventoryRoot(); + LLInventoryObject::object_list_t contents; + objectp->getInventoryContents(contents); + + if (inventory_root) + { + reset(); + mIsInventoryEmpty = false; + createFolderViews(inventory_root, contents); + mFolders->setEnabled(true); + } + else + { + // TODO: create an empty inventory + mIsInventoryEmpty = true; + } + + mHaveInventory = !mIsInventoryEmpty || !objectp->isInventoryDirty(); + if (objectp->isInventoryDirty()) + { + // Inventory is dirty, yet we received inventoryChanged() callback. + // User changed something during ongoing request. + // Rerequest. It will clear dirty flag and won't create dupplicate requests. + objectp->requestInventory(); + } + } + else + { + // TODO: create an empty inventory + mIsInventoryEmpty = true; + mHaveInventory = true; + } + + // restore previous selection + bool first_item = true; + for (const LLUUID& item_id : selected_item_ids) + { + if (LLFolderViewItem* selected_item = getItemByID(item_id)) + { + // HACK: "set" first item then "change" each other one to get keyboard focus right + if (first_item) + { + mFolders->setSelection(selected_item, true, inventory_has_focus); + first_item = false; + } + else + { + mFolders->changeSelection(selected_item, true); + } + } + } + + if (mFolders) + { + mFolders->requestArrange(); + } + + mInventoryNeedsUpdate = false; + // Edit menu handler is set in onFocusReceived } // *FIX: This is currently a very expensive operation, because we have @@ -1555,26 +1541,25 @@ void LLPanelObjectInventory::updateInventory() // have that in our current arsenal. void LLPanelObjectInventory::createFolderViews(LLInventoryObject* inventory_root, LLInventoryObject::object_list_t& contents) { - if (!inventory_root) - { - return; - } - // Create a visible root category. - LLTaskInvFVBridge* bridge = NULL; - bridge = LLTaskInvFVBridge::createObjectBridge(this, inventory_root); - if(bridge) - { - LLUIColor item_color = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE); - - LLFolderViewFolder::Params p; - p.name = inventory_root->getName(); - p.tool_tip = p.name; - p.root = mFolders; - p.listener = bridge; - p.font_color = item_color; - p.font_highlight_color = item_color; - - LLFolderViewFolder* new_folder = LLUICtrlFactory::create<LLFolderViewFolder>(p); + if (!inventory_root) + { + return; + } + + // Create a visible root category. + if (LLTaskInvFVBridge* bridge = LLTaskInvFVBridge::createObjectBridge(this, inventory_root)) + { + LLUIColor item_color = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE); + + LLFolderViewFolder::Params p; + p.name = inventory_root->getName(); + p.tool_tip = p.name; + p.root = mFolders; + p.listener = bridge; + p.font_color = item_color; + p.font_highlight_color = item_color; + + LLFolderViewFolder* new_folder = LLUICtrlFactory::create<LLFolderViewFolder>(p); if (mShowRootFolder) { @@ -1582,346 +1567,327 @@ void LLPanelObjectInventory::createFolderViews(LLInventoryObject* inventory_root new_folder->toggleOpen(); } - if (!contents.empty()) - { - createViewsForCategory(&contents, inventory_root, mShowRootFolder ? new_folder : mFolders); - } + if (!contents.empty()) + { + createViewsForCategory(&contents, inventory_root, mShowRootFolder ? new_folder : mFolders); + } if (mShowRootFolder) { // Refresh for label to add item count new_folder->refresh(); } - } + } } typedef std::pair<LLInventoryObject*, LLFolderViewFolder*> obj_folder_pair; -void LLPanelObjectInventory::createViewsForCategory(LLInventoryObject::object_list_t* inventory, - LLInventoryObject* parent, - LLFolderViewFolder* folder) -{ - LLUIColor item_color = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE); - - // Find all in the first pass - std::vector<obj_folder_pair*> child_categories; - LLTaskInvFVBridge* bridge; - LLFolderViewItem* view; - - LLInventoryObject::object_list_t::iterator it = inventory->begin(); - LLInventoryObject::object_list_t::iterator end = inventory->end(); - for( ; it != end; ++it) - { - LLInventoryObject* obj = *it; - - if(parent->getUUID() == obj->getParentUUID()) - { - bridge = LLTaskInvFVBridge::createObjectBridge(this, obj); - if(!bridge) - { - continue; - } - if(LLAssetType::AT_CATEGORY == obj->getType()) - { - LLFolderViewFolder::Params p; - p.name = obj->getName(); - p.root = mFolders; - p.listener = bridge; - p.tool_tip = p.name; - p.font_color = item_color; - p.font_highlight_color = item_color; - view = LLUICtrlFactory::create<LLFolderViewFolder>(p); - child_categories.push_back(new obj_folder_pair(obj, - (LLFolderViewFolder*)view)); - } - else - { - LLFolderViewItem::Params params; - params.name(obj->getName()); - params.creation_date(bridge->getCreationDate()); - params.root(mFolders); - params.listener(bridge); - params.rect(LLRect()); - params.tool_tip = params.name; - params.font_color = item_color; - params.font_highlight_color = item_color; - view = LLUICtrlFactory::create<LLFolderViewItem> (params); - } - view->addToFolder(folder); - addItemID(obj->getUUID(), view); - } - } - - // now, for each category, do the second pass - for(S32 i = 0; i < child_categories.size(); i++) - { - createViewsForCategory(inventory, child_categories[i]->first, - child_categories[i]->second ); - delete child_categories[i]; - } +void LLPanelObjectInventory::createViewsForCategory(LLInventoryObject::object_list_t* inventory, + LLInventoryObject* parent, + LLFolderViewFolder* folder) +{ + LLUIColor item_color = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE); + + // Find all in the first pass + std::vector<obj_folder_pair*> child_categories; + for (const LLPointer<LLInventoryObject>& obj : *inventory) + { + if (parent->getUUID() == obj->getParentUUID()) + { + if (LLTaskInvFVBridge* bridge = LLTaskInvFVBridge::createObjectBridge(this, obj)) + { + LLFolderViewItem* view; + if (LLAssetType::AT_CATEGORY == obj->getType()) + { + LLFolderViewFolder::Params params; + params.name = obj->getName(); + params.root = mFolders; + params.listener = bridge; + params.tool_tip = params.name; + params.font_color = item_color; + params.font_highlight_color = item_color; + view = LLUICtrlFactory::create<LLFolderViewFolder>(params); + child_categories.push_back(new obj_folder_pair(obj, (LLFolderViewFolder*)view)); + } + else + { + LLFolderViewItem::Params params; + params.name = obj->getName(); + params.root = mFolders; + params.listener = bridge; + params.creation_date = bridge->getCreationDate(); + params.rect = LLRect(); + params.tool_tip = params.name; + params.font_color = item_color; + params.font_highlight_color = item_color; + view = LLUICtrlFactory::create<LLFolderViewItem>(params); + } + + view->addToFolder(folder); + addItemID(obj->getUUID(), view); + } + } + } + + // now, for each category, do the second pass + for (obj_folder_pair* pair : child_categories) + { + createViewsForCategory(inventory, pair->first, pair->second); + delete pair; + } folder->setChildrenInited(true); } void LLPanelObjectInventory::refresh() { - //LL_INFOS() << "LLPanelObjectInventory::refresh()" << LL_ENDL; - BOOL has_inventory = FALSE; - const BOOL non_root_ok = TRUE; - LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection(); - LLSelectNode* node = selection->getFirstRootNode(NULL, non_root_ok); - if(node && node->mValid) - { - LLViewerObject* object = node->getObject(); - if(object && ((selection->getRootObjectCount() == 1) - || (selection->getObjectCount() == 1))) - { - // determine if we need to make a request. Start with a - // default based on if we have inventory at all. - BOOL make_request = !mHaveInventory; - - // If the task id is different than what we've stored, - // then make the request. - if(mTaskUUID != object->mID) - { - mTaskUUID = object->mID; - mAttachmentUUID = object->getAttachmentItemID(); - make_request = TRUE; - - // This is a new object so pre-emptively clear the contents - // Otherwise we show the old stuff until the update comes in - clearContents(); - - // Register for updates from this object, - registerVOInventoryListener(object,NULL); - } - else if (mAttachmentUUID != object->getAttachmentItemID()) - { - mAttachmentUUID = object->getAttachmentItemID(); - if (mAttachmentUUID.notNull()) - { - // Server unsubsribes viewer (deselects object) from property - // updates after "ObjectAttach" so we need to resubscribe - LLSelectMgr::getInstance()->sendSelect(); - } - } - - // Based on the node information, we may need to dirty the - // object inventory and get it again. - if(node->mValid) - { - if(node->mInventorySerial != object->getInventorySerial() || object->isInventoryDirty()) - { - make_request = TRUE; - } - } - - // do the request if necessary. - if(make_request) - { - requestVOInventory(); - } - has_inventory = TRUE; - } - } - if(!has_inventory) - { - clearInventoryTask(); - } - mInventoryViewModel.setTaskID(mTaskUUID); - //LL_INFOS() << "LLPanelObjectInventory::refresh() " << mTaskUUID << LL_ENDL; + //LL_INFOS() << "LLPanelObjectInventory::refresh()" << LL_ENDL; + bool has_inventory = false; + const bool non_root_ok = true; + LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection(); + LLSelectNode* node = selection->getFirstRootNode(NULL, non_root_ok); + if (node && node->mValid) + { + LLViewerObject* object = node->getObject(); + if (object && ((selection->getRootObjectCount() == 1) || (selection->getObjectCount() == 1))) + { + // determine if we need to make a request. Start with a + // default based on if we have inventory at all. + bool make_request = !mHaveInventory; + + // If the task id is different than what we've stored, + // then make the request. + if (mTaskUUID != object->mID) + { + mTaskUUID = object->mID; + mAttachmentUUID = object->getAttachmentItemID(); + make_request = true; + + // This is a new object so pre-emptively clear the contents + // Otherwise we show the old stuff until the update comes in + clearContents(); + + // Register for updates from this object, + registerVOInventoryListener(object,NULL); + } + else if (mAttachmentUUID != object->getAttachmentItemID()) + { + mAttachmentUUID = object->getAttachmentItemID(); + if (mAttachmentUUID.notNull()) + { + // Server unsubsribes viewer (deselects object) from property + // updates after "ObjectAttach" so we need to resubscribe + LLSelectMgr::getInstance()->sendSelect(); + } + } + + // Based on the node information, we may need to dirty the + // object inventory and get it again. + if (node->mValid) + { + if (node->mInventorySerial != object->getInventorySerial() || object->isInventoryDirty()) + { + make_request = true; + } + } + + // do the request if necessary. + if (make_request) + { + requestVOInventory(); + } + has_inventory = true; + } + } + + if (!has_inventory) + { + clearInventoryTask(); + } + + mInventoryViewModel.setTaskID(mTaskUUID); + //LL_INFOS() << "LLPanelObjectInventory::refresh() " << mTaskUUID << LL_ENDL; } void LLPanelObjectInventory::clearInventoryTask() { - mTaskUUID = LLUUID::null; - mAttachmentUUID = LLUUID::null; - removeVOInventoryListener(); - clearContents(); + mTaskUUID = LLUUID::null; + mAttachmentUUID = LLUUID::null; + removeVOInventoryListener(); + clearContents(); } void LLPanelObjectInventory::removeSelectedItem() { - if(mFolders) - { - mFolders->removeSelectedItems(); - } + if (mFolders) + { + mFolders->removeSelectedItems(); + } } void LLPanelObjectInventory::startRenamingSelectedItem() { - if(mFolders) - { - mFolders->startRenamingSelectedItem(); - } + if (mFolders) + { + mFolders->startRenamingSelectedItem(); + } } void LLPanelObjectInventory::draw() { - LLPanel::draw(); - - if(mIsInventoryEmpty) - { - if((LLUUID::null != mTaskUUID) && (!mHaveInventory)) - { - LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("LoadingContents"), 0, - (S32)(getRect().getWidth() * 0.5f), - 10, - LLColor4( 1, 1, 1, 1 ), - LLFontGL::HCENTER, - LLFontGL::BOTTOM); - } - else if(mHaveInventory) - { - LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("NoContents"), 0, - (S32)(getRect().getWidth() * 0.5f), - 10, - LLColor4( 1, 1, 1, 1 ), - LLFontGL::HCENTER, - LLFontGL::BOTTOM); - } - } + LLPanel::draw(); + + if (mIsInventoryEmpty) + { + std::string text; + if (!mHaveInventory && mTaskUUID.notNull()) + { + text = LLTrans::getString("LoadingContents"); + } + else if (mHaveInventory) + { + text = LLTrans::getString("NoContents"); + } + + if (!text.empty()) + { + LLFontGL::getFontSansSerif()->renderUTF8(text, 0, + (S32)(getRect().getWidth() * 0.5f), + 10, + LLColor4(1, 1, 1, 1), + LLFontGL::HCENTER, + LLFontGL::BOTTOM); + } + } } void LLPanelObjectInventory::deleteAllChildren() { - mScroller = NULL; - mFolders = NULL; - LLView::deleteAllChildren(); -} - -BOOL LLPanelObjectInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg) -{ - if (mFolders) - { - LLFolderViewItem* folderp = mFolders->getNextFromChild(NULL); - if (!folderp) - { - return FALSE; - } - // Try to pass on unmodified mouse coordinates - S32 local_x = x - mFolders->getRect().mLeft; - S32 local_y = y - mFolders->getRect().mBottom; - - if (mFolders->pointInView(local_x, local_y)) - { - return mFolders->handleDragAndDrop(local_x, local_y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); - } - else - { - //force mouse coordinates to be inside folder rectangle - return mFolders->handleDragAndDrop(5, 1, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); - } - } - else - { - return FALSE; - } + mScroller = NULL; + mFolders = NULL; + LLView::deleteAllChildren(); +} + +bool LLPanelObjectInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg) +{ + LLFolderViewItem* folderp = mFolders ? mFolders->getNextFromChild(NULL) : NULL; + if (!folderp) + return false; + + // Try to pass on unmodified mouse coordinates + S32 local_x = x - mFolders->getRect().mLeft; + S32 local_y = y - mFolders->getRect().mBottom; + + if (mFolders->pointInView(local_x, local_y)) + { + return mFolders->handleDragAndDrop(local_x, local_y, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); + } + + //force mouse coordinates to be inside folder rectangle + return mFolders->handleDragAndDrop(5, 1, mask, drop, cargo_type, cargo_data, accept, tooltip_msg); } //static void LLPanelObjectInventory::idle(void* user_data) { - LLPanelObjectInventory* self = (LLPanelObjectInventory*)user_data; + LLPanelObjectInventory* self = (LLPanelObjectInventory*)user_data; - if (self->mFolders) - { - self->mFolders->update(); - } - if (self->mInventoryNeedsUpdate) - { - self->updateInventory(); - } + if (self->mFolders) + { + self->mFolders->update(); + } + if (self->mInventoryNeedsUpdate) + { + self->updateInventory(); + } } void LLPanelObjectInventory::onFocusLost() { - // inventory no longer handles cut/copy/paste/delete - if (LLEditMenuHandler::gEditMenuHandler == mFolders) - { - LLEditMenuHandler::gEditMenuHandler = NULL; - } - - LLPanel::onFocusLost(); + // inventory no longer handles cut/copy/paste/delete + if (LLEditMenuHandler::gEditMenuHandler == mFolders) + { + LLEditMenuHandler::gEditMenuHandler = NULL; + } + + LLPanel::onFocusLost(); } void LLPanelObjectInventory::onFocusReceived() { - // inventory now handles cut/copy/paste/delete - LLEditMenuHandler::gEditMenuHandler = mFolders; - - LLPanel::onFocusReceived(); -} + // inventory now handles cut/copy/paste/delete + LLEditMenuHandler::gEditMenuHandler = mFolders; + LLPanel::onFocusReceived(); +} LLFolderViewItem* LLPanelObjectInventory::getItemByID( const LLUUID& id ) { - std::map<LLUUID, LLFolderViewItem*>::iterator map_it; - map_it = mItemMap.find(id); - if (map_it != mItemMap.end()) - { - return map_it->second; - } + std::map<LLUUID, LLFolderViewItem*>::iterator map_it = mItemMap.find(id); + if (map_it != mItemMap.end()) + { + return map_it->second; + } - return NULL; + return NULL; } void LLPanelObjectInventory::removeItemID( const LLUUID& id ) { - mItemMap.erase(id); + mItemMap.erase(id); } void LLPanelObjectInventory::addItemID( const LLUUID& id, LLFolderViewItem* itemp ) { - mItemMap[id] = itemp; + mItemMap[id] = itemp; } void LLPanelObjectInventory::clearItemIDs() { - mItemMap.clear(); + mItemMap.clear(); } -BOOL LLPanelObjectInventory::handleKeyHere( KEY key, MASK mask ) +bool LLPanelObjectInventory::handleKeyHere( KEY key, MASK mask ) { - BOOL handled = FALSE; - switch (key) - { - case KEY_DELETE: + bool handled = false; + switch (key) + { + case KEY_DELETE: #if LL_DARWIN - case KEY_BACKSPACE: + case KEY_BACKSPACE: #endif - // Delete selected items if delete or backspace key hit on the inventory panel - // Note: on Mac laptop keyboards, backspace and delete are one and the same - if (isSelectionRemovable() && mask == MASK_NONE) - { - LLInventoryAction::doToSelected(&gInventory, mFolders, "delete"); - handled = TRUE; - } - break; - } - return handled; -} - -BOOL LLPanelObjectInventory::isSelectionRemovable() -{ - if (!mFolders || !mFolders->getRoot()) - { - return FALSE; - } - std::set<LLFolderViewItem*> selection_set = mFolders->getRoot()->getSelectionList(); - if (selection_set.empty()) - { - return FALSE; - } - for (std::set<LLFolderViewItem*>::iterator iter = selection_set.begin(); - iter != selection_set.end(); - ++iter) - { - LLFolderViewItem *item = *iter; - const LLFolderViewModelItemInventory *listener = dynamic_cast<const LLFolderViewModelItemInventory*>(item->getViewModelItem()); - if (!listener || !listener->isItemRemovable() || listener->isItemInTrash()) - { - return FALSE; - } - } - return TRUE; + // Delete selected items if delete or backspace key hit on the inventory panel + // Note: on Mac laptop keyboards, backspace and delete are one and the same + if (isSelectionRemovable() && mask == MASK_NONE) + { + LLInventoryAction::doToSelected(&gInventory, mFolders, "delete"); + handled = true; + } + break; + } + return handled; +} + +bool LLPanelObjectInventory::isSelectionRemovable() +{ + if (!mFolders || !mFolders->getRoot()) + { + return false; + } + + std::set<LLFolderViewItem*> selection_set = mFolders->getRoot()->getSelectionList(); + if (selection_set.empty()) + { + return false; + } + + for (LLFolderViewItem* item : selection_set) + { + const LLFolderViewModelItemInventory *listener = dynamic_cast<const LLFolderViewModelItemInventory*>(item->getViewModelItem()); + if (!listener || !listener->isItemRemovable() || listener->isItemInTrash()) + { + return false; + } + } + + return true; } |