diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-16 10:41:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 10:41:10 -0400 |
| commit | 557376b95c28379e8e6edf9a73a25929b900784e (patch) | |
| tree | 08ae3a78fc6f68c034f361365a8b42b2275405bb /indra/newview/llinventorybridge.h | |
| parent | 39d79080c08119d1da0cd26868e81de887ff6ddb (diff) | |
| parent | e4cea7631293b1192bfe720146410c1aa61654aa (diff) | |
merge changes for storm-1898
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; |