summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-10-13 20:06:30 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-10-13 20:06:30 -0600
commit22958ae80351f33287c978b9896258d460f722dc (patch)
treedbb5b1bc3070cafc92d46c808b224bade01575f3 /indra/newview/skins
parent03277635d03e8e7c2f73285743fdd9c77802d76f (diff)
parent7af6d1c7319bc0f339e9159161c05ed6eb45fb5b (diff)
Merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_notify.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_pick_list_item.xml1
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_appearance.xml1
4 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 6f271a757c..cded4cf31a 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -85,6 +85,7 @@
layout="topleft"
left="45"
name="attachment"
+ parse_urls="false"
text_color="GroupNotifyTextColor"
value="Attachment"
use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index e0426c75b4..a48a9ce626 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -132,6 +132,7 @@
height="18"
layout="topleft"
name="curr_outfit_name"
+ parse_urls="false"
text_color="LtGray"
top_pad="2"
value="[Current Outfit]"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index de147908d8..43d580844f 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -52,6 +52,7 @@
layout="topleft"
left="110"
name="picture_name"
+ parse_urls="false"
text_color="white"
top="9"
use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index c1c0f07304..b5839878d5 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -77,6 +77,7 @@ width="333">
font="SansSerifLargeBold"
height="20"
left="35"
+ parse_urls="false"
text_color="White"
top="15"
use_ellipses="true"