From c3e4fd975cd6ce7af9521143d469ec9f017d47dd Mon Sep 17 00:00:00 2001
From: Twisted_Laws <none@none>
Date: Fri, 15 Apr 2011 14:32:56 -0400
Subject: [PATCH] STORM-1103 Nearby sidebar minimap should be optional, changes
from review
---
indra/newview/app_settings/settings.xml | 2 +-
.../skins/default/xui/en/panel_people.xml | 79 ++++++++++++-------
2 files changed, 50 insertions(+), 31 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ebddb2d73ae..bb4f2664cd0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9180,7 +9180,7 @@
<key>NearbyListShowMap</key>
<map>
<key>Comment</key>
- <string>Show/hide map in nearby list</string>
+ <string>Show/hide map above nearby people list</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 1869eec476f..775805ad2e7 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -87,7 +87,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
width="319">
<panel
background_opaque="true"
- background_visible="true"
+ background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
follows="all"
@@ -99,35 +99,54 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
name="nearby_panel"
top="0"
width="313">
- <layout_stack orientation="vertical" clip="false" follows="all" layout="topleft" top="0" left="0" height="355" width="313" mouse_opaque="false">
- <layout_panel layout="topleft" top="0" left="0" height="142" width="313" user_resize="false" mouse_opaque="false" visibility_control="NearbyListShowMap">
- <net_map
- bg_color="NetMapBackgroundColor"
- follows="all"
- layout="topleft"
- left="3"
- mouse_opaque="false"
- name="Net Map"
- width="305"
- height="140"
- top="4"/>
- </layout_panel>
- <layout_panel layout="topleft" height="213" min_height="100" width="313" user_resize="false" mouse_opaque="false">
- <avatar_list
- allow_select="true"
- follows="all"
- height="211"
- ignore_online_status="true"
- layout="topleft"
- left="3"
- multi_select="true"
- keep_one_selected="false"
- name="avatar_list"
- top="2"
- width="306" />
- </layout_panel>
- </layout_stack>
- <panel
+ <layout_stack
+ clip="false"
+ follows="all"
+ height="355"
+ layout="topleft"
+ mouse_opaque="false"
+ orientation="vertical"
+ width="313">
+ <layout_panel
+ height="142"
+ layout="topleft"
+ mouse_opaque="false"
+ user_resize="false"
+ visibility_control="NearbyListShowMap"
+ width="313">
+ <net_map
+ bg_color="NetMapBackgroundColor"
+ follows="all"
+ height="140"
+ layout="topleft"
+ left="3"
+ mouse_opaque="false"
+ name="Net Map"
+ top="4"
+ width="305"/>
+ </layout_panel>
+ <layout_panel
+ height="213"
+ layout="topleft"
+ min_height="100"
+ mouse_opaque="false"
+ user_resize="false"
+ width="313">
+ <avatar_list
+ allow_select="true"
+ follows="all"
+ height="211"
+ ignore_online_status="true"
+ layout="topleft"
+ left="3"
+ keep_one_selected="false"
+ multi_select="true"
+ name="avatar_list"
+ top="2"
+ width="306" />
+ </layout_panel>
+ </layout_stack>
+ <panel
background_visible="true"
follows="left|right|bottom"
height="27"
--
GitLab