summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-05-10 13:59:57 -0400
committerLoren Shih <seraph@lindenlab.com>2010-05-10 13:59:57 -0400
commit79457a85fe660eeafc30618ae4541aa787c749ec (patch)
tree4ee7e761a7cbe3cf515a321d9b989afaa9912dfe
parent8e1dbbbb5628eee210a0a7c25f32287d7b754a8b (diff)
EXT-7293 : Make link items easier to distinguish from regular items
Link items now appear in light gray.
-rw-r--r--indra/newview/llfolderviewitem.cpp3
-rw-r--r--indra/newview/skins/default/colors.xml3
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp
index 3208218302..fd5fafdfe5 100644
--- a/indra/newview/llfolderviewitem.cpp
+++ b/indra/newview/llfolderviewitem.cpp
@@ -836,6 +836,7 @@ void LLFolderViewItem::draw()
static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", DEFAULT_WHITE);
static LLUIColor sSuffixColor = LLUIColorTable::instance().getColor("InventoryItemColor", DEFAULT_WHITE);
static LLUIColor sLibraryColor = LLUIColorTable::instance().getColor("InventoryItemLibraryColor", DEFAULT_WHITE);
+ static LLUIColor sLinkColor = LLUIColorTable::instance().getColor("InventoryItemLinkColor", DEFAULT_WHITE);
static LLUIColor sSearchStatusColor = LLUIColorTable::instance().getColor("InventorySearchStatusColor", DEFAULT_WHITE);
const Params& default_params = LLUICtrlFactory::getDefaultParams<LLFolderViewItem>();
@@ -965,6 +966,8 @@ void LLFolderViewItem::draw()
}
LLColor4 color = (mIsSelected && filled) ? sHighlightFgColor : sFgColor;
+ const LLViewerInventoryItem *item = getInventoryItem();
+ if (item && item->getIsLinkType()) color = sLinkColor;
if (in_library) color = sLibraryColor;
F32 right_x = 0;
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 99603530d8..0540a03e25 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -424,6 +424,9 @@
name="InventoryItemLibraryColor"
reference="EmphasisColor" />
<color
+ name="InventoryItemLinkColor"
+ reference="LtGray_50" />
+ <color
name="InventorySearchStatusColor"
reference="EmphasisColor" />
<color