merge changes for storm-1103

meow-7.2.2
Oz Linden 2011-06-28 09:22:50 -04:00
commit 8e6ea481cf
1 changed files with 4 additions and 3 deletions

View File

@ -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"