summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-04-26 09:49:48 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-04-26 09:49:48 -0700
commit228a312cf68088a8388a9318d1c8d23aaa52eaab (patch)
tree6f33f3bb2375b96f9eab2d87dfabef67cc4e924a
parent7902e05c9f52e16d3e505f9d7a8852743a212586 (diff)
ACME-252 Create AvatarFolderItemView: Corrected person_tab_view.xml and person_view.xml to have the proper parent tag. It was conversation_view_session for both which was wrong. Also updated the selected color for the personview.
-rw-r--r--indra/newview/llpersontabview.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/person_tab_view.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/person_view.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpersontabview.cpp b/indra/newview/llpersontabview.cpp
index dc55f627d6..3093ff9015 100644
--- a/indra/newview/llpersontabview.cpp
+++ b/indra/newview/llpersontabview.cpp
@@ -163,7 +163,7 @@ void LLPersonView::draw()
void LLPersonView::drawHighlight()
{
- static LLUIColor outline_color = LLUIColorTable::instance().getColor("Green_80", DEFAULT_WHITE);
+ static LLUIColor outline_color = LLUIColorTable::instance().getColor("EmphasisColor", DEFAULT_WHITE);
S32 width = getRect().getWidth();
S32 height = mItemHeight;
diff --git a/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml b/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml
index d46938d3b7..af5aec2c34 100644
--- a/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<conversation_view_session
+<person_tab_view
folder_arrow_image="Folder_Arrow"
folder_indentation="5"
item_height="24"
diff --git a/indra/newview/skins/default/xui/en/widgets/person_view.xml b/indra/newview/skins/default/xui/en/widgets/person_view.xml
index d46938d3b7..13aa26959f 100644
--- a/indra/newview/skins/default/xui/en/widgets/person_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/person_view.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<conversation_view_session
+<person_view
folder_arrow_image="Folder_Arrow"
folder_indentation="5"
item_height="24"