livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7429 FIXED Removed itallicise \"worn\" objects in inventory panels 

- Added checking in LLItemBridge::getLabelStyle() if item is worn
- Also deleted unnecessary method LLObjectBridge::getLabelStyle() as it duplicate LLItemBridge::getLabelStyle()

Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/501/

--HG--
branch : product-engine
meow-7.2.2
Paul Guslisty 2010-06-03 20:46:56 +03:00
parent c7b3ff29c0
commit 5dc2fcf8e2
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llinventorybridge.cpp
View File

@ -1194,18 +1194,18 @@ void LLItemBridge::buildDisplayName(LLInventoryItem* item, std::string& name)
LLFontGL::StyleFlags LLItemBridge::getLabelStyle() const
{
U8 font = LLFontGL::NORMAL;
const LLViewerInventoryItem* item = getItem();
if (get_is_item_worn(mUUID))
{
// llinfos << "BOLD" << llendl;
font |= LLFontGL::BOLD;
}
const LLViewerInventoryItem* item = getItem();
if (item && item->getIsLinkType())
else if(item && item->getIsLinkType())
{
font |= LLFontGL::ITALIC;
}
return (LLFontGL::StyleFlags)font;
}
@ -4029,24 +4029,6 @@ void LLObjectBridge::openItem()
get_is_item_worn(mUUID) ? "detach" : "attach");
}
LLFontGL::StyleFlags LLObjectBridge::getLabelStyle() const
{
U8 font = LLFontGL::NORMAL;
if(get_is_item_worn( mUUID ) )
{
font |= LLFontGL::BOLD;
}
LLInventoryItem* item = getItem();
if (item && item->getIsLinkType())
{
font |= LLFontGL::ITALIC;
}
return (LLFontGL::StyleFlags)font;
}
std::string LLObjectBridge::getLabelSuffix() const
{
if (get_is_item_worn(mUUID))

1
indra/newview/llinventorybridge.h
View File

@ -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);