diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-04 13:58:18 +0300 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-04 13:58:18 +0300 |
commit | 15711b29afd293acd23d948a51ea65795335c95f (patch) | |
tree | 8fdbb8e7275ed5d16a19d8bc3434b69d687b0b61 /indra/newview/llinventorybridge.h | |
parent | 9345f01d4b61f857ed540cf725c8cd0ee1b0ef24 (diff) | |
parent | e1189d0e2ee47539edc68c3532e0a5ce64d5dcd1 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r-- | indra/newview/llinventorybridge.h | 1 |
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); |