summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-06 18:42:51 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-06 18:42:51 -0500
commit35ae4085474e246094ef7767bdc2db31da569a98 (patch)
tree86025b7fa6de64ea2cb9394c5cd564eebd88ecba /indra/newview/llinventorybridge.h
parent1c40cf8225013ac31d70b46b5cdec0b5df147889 (diff)
parent573e986ea273d37438ed6a2ca3f81d005f1bab99 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r--indra/newview/llinventorybridge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index f95e8f9361..3ffeb55d6c 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -383,6 +383,8 @@ class LLTextureBridge : public LLItemBridge
public:
virtual LLUIImagePtr getIcon() const;
virtual void openItem();
+ virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
+ virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
protected:
LLTextureBridge(LLInventoryPanel* inventory, const LLUUID& uuid, LLInventoryType::EType type) :