diff options
author | Oz Linden <oz@lindenlab.com> | 2012-08-22 08:46:19 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-08-22 08:46:19 -0400 |
commit | 63d04204a99802d3200452e101d9bb1b898be881 (patch) | |
tree | 457b4b2336afd03f982ff04b7340ec5cb8dfcda4 /indra/newview/llinventorybridge.h | |
parent | 5949d605d757c97819b7b55d1860d36031a3d38f (diff) | |
parent | e0f391df2a95192130bdfeb0d4f03ad6ca489eef (diff) |
merge changes for DRTVWR-203
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r-- | indra/newview/llinventorybridge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index dc9e88d54d..118430efe1 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; |