diff options
author | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
commit | 403d1b6404355fa26b0bfeff206f5c56758a491c (patch) | |
tree | 6438eb8fa29dc8946d404ac79f89cf1bd140bbe1 /indra/newview/llinventorybridge.h | |
parent | 21c364c4d455cc05ec176032e8c090be0cc4ed50 (diff) | |
parent | 825cc7873251ad90720ab40221d689abed7b2ac8 (diff) |
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r-- | indra/newview/llinventorybridge.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 067e4bdf3d..f439c45dd3 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -197,6 +197,8 @@ public: const LLUUID& uuid) : LLInvFVBridge(inventory, root, uuid) {} + typedef boost::function<void(std::string& slurl)> slurl_callback_t; + virtual void performAction(LLInventoryModel* model, std::string action); virtual void selectItem(); virtual void restoreItem(); @@ -214,7 +216,6 @@ public: virtual BOOL isItemCopyable() const; virtual BOOL hasChildren() const { return FALSE; } virtual BOOL isUpToDate() const { return TRUE; } - /*virtual*/ void clearDisplayName() { mDisplayName.clear(); } LLViewerInventoryItem* getItem() const; @@ -497,9 +498,6 @@ public: void editOnAvatar(); static BOOL canRemoveFromAvatar( void* userdata ); - static void onRemoveFromAvatar( void* userdata ); - static void onRemoveFromAvatarArrived( LLViewerWearable* wearable, void* userdata ); - static void removeItemFromAvatar(LLViewerInventoryItem *item); static void removeAllClothesFromAvatar(); void removeFromAvatar(); protected: |