summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-04 11:16:32 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-04 11:16:32 +0100
commit66d367cb0dfa1b6745a91d770053087e807d5aa9 (patch)
tree0a86eeccb9d130ccac6cb63169300ad2b5ba601b /indra/newview/llinventorybridge.h
parent697e7a3b0c6a6a014bbf4eebc801f15c0af0a235 (diff)
parentbe7554c3b624427ccf8543fb0a3187a2d9f7090b (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r--indra/newview/llinventorybridge.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 59c1f3d6fb..310fd7fb1d 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -436,7 +436,6 @@ public:
virtual LLUIImagePtr getIcon() const;
virtual void performAction(LLInventoryModel* model, std::string action);
virtual void openItem();
- virtual LLFontGL::StyleFlags getLabelStyle() const;
virtual std::string getLabelSuffix() const;
virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
virtual BOOL renameItem(const std::string& new_name);