summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-28 09:22:50 -0400
committerOz Linden <oz@lindenlab.com>2011-06-28 09:22:50 -0400
commit8e6ea481cfc900e4dc44dcbb185429686e85b8de (patch)
tree1e67e69328903ec53ade2d3aea6cab8295563f9e /indra/newview/skins/default/xui
parent94bb9c595558d04baaee203ddf1db1b4a8f60f3d (diff)
parentbd6e1b7fd8b5dd45ccf246bd7fbc7f2071aa0d1c (diff)
merge changes for storm-1103
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 775805ad2e..e478d7c9e2 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -110,8 +110,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
<layout_panel
height="142"
layout="topleft"
+ min_dim="100"
mouse_opaque="false"
- user_resize="false"
+ user_resize="true"
visibility_control="NearbyListShowMap"
width="313">
<net_map
@@ -128,9 +129,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
<layout_panel
height="213"
layout="topleft"
- min_height="100"
+ min_dim="100"
mouse_opaque="false"
- user_resize="false"
+ user_resize="true"
width="313">
<avatar_list
allow_select="true"