summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.pngbin0 -> 368 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.pngbin0 -> 366 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_display_name.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_list_item_short.xml18
5 files changed, 20 insertions, 3 deletions
diff --git a/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png
new file mode 100644
index 0000000000..09e627861c
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Dark.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png
new file mode 100644
index 0000000000..1a5aa63727
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Profile_Search_Visibility_Light.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index bbf3484595..c02bef3a45 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -506,6 +506,9 @@ with the same filename but different name
<texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" />
<texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" />
+ <texture name="Profile_Search_Visibility_Dark" file_name="icons/Profile_Search_Visibility_Dark.png" preload="true"/>
+ <texture name="Profile_Search_Visibility_Light" file_name="icons/Profile_Search_Visibility_Light.png" preload="true"/>
+
<texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
<texture name="ProgressBarSolid" file_name="widgets/ProgressBarSolid.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
<texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
index d14b4a1699..3c8f415860 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -23,7 +23,7 @@
use_ellipses="true"
width="380"
wrap="true">
- The name you give your avatar is called your Display Name. You can change it once a week.
+ Your display name is what other people see above your head. It is different from your login name. You can change it once a week.
</text>
<text
type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
index fb46d1cce3..ee99625497 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item_short.xml
@@ -54,11 +54,25 @@
use_ellipses="true"
/>
<button
+ name="visibility_btn"
+ tool_tip="Toogle visibility in profile"
+ top_delta="-1"
+ left_pad="3"
+ right="-53"
+ height="14"
+ width="20"
+ follows="right"
+ image_pressed="Profile_Search_Visibility_Dark"
+ image_unselected="Profile_Search_Visibility_Light"
+ tab_stop="false"
+ visible="false"
+ />
+ <button
name="info_btn"
tool_tip="More info"
- top_delta="-2"
+ top_delta="-1"
left_pad="3"
- right="-31"
+ right="-30"
height="16"
width="16"
follows="right"