diff options
| author | Bradley Payne <vir@lindenlab.com> | 2009-09-10 18:42:19 +0000 |
|---|---|---|
| committer | Bradley Payne <vir@lindenlab.com> | 2009-09-10 18:42:19 +0000 |
| commit | 73d152093dd5bb31ad264afdd3dc8e283dff49e3 (patch) | |
| tree | f69a7b99e675affb4bd4b3cab248b425caaf5566 /indra/newview/llinventorybridge.h | |
| parent | 3dfa1e4ab9da0d2a5d48ea771877fc16fdd73ad5 (diff) | |
For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3.
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 25859b7f73..bc950520aa 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -200,9 +200,8 @@ protected: BOOL isInTrash() const; BOOL isLinkedObjectInTrash() const; // Is this obj or its baseobj in the trash? - // return true if the item is in agent inventory. if false, it - // must be lost or in the inventory library. - BOOL isAgentInventory() const; + BOOL isAgentInventory() const; // false if lost or in the inventory library + BOOL isCOFFolder() const; // true if COF or descendent of. virtual BOOL isItemPermissive() const; static void changeItemParent(LLInventoryModel* model, LLViewerInventoryItem* item, @@ -295,6 +294,7 @@ public: virtual BOOL isItemMovable(); virtual BOOL isUpToDate() const; virtual BOOL isItemCopyable() const; + virtual BOOL isClipboardPasteableAsLink() const; virtual BOOL copyToClipboard() const; static void createWearable(LLFolderBridge* bridge, EWearableType type); @@ -769,8 +769,6 @@ protected: }; void wear_inventory_item_on_avatar(LLInventoryItem* item); -void wear_outfit_by_name(const std::string& name); -void wear_inventory_category(LLInventoryCategory* category, bool copy, bool append); class LLViewerJointAttachment; void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attachment); @@ -787,4 +785,5 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id, void teleport_via_landmark(const LLUUID& asset_id); + #endif // LL_LLINVENTORYBRIDGE_H |