diff options
| author | Squire <squire@lindenlab.com> | 2011-06-28 11:48:25 -0700 |
|---|---|---|
| committer | Squire <squire@lindenlab.com> | 2011-06-28 11:48:25 -0700 |
| commit | 03969822f5cff99c124772466bf4e86da9fa05aa (patch) | |
| tree | 7caba1865fb37d905e0b33e62baab3c19971eace /indra/newview/skins | |
| parent | df91a44d2951fa348796610f0c84be25bd2031e0 (diff) | |
| parent | 3bc99274f19ce0cbc3e600c0010655e2778ab405 (diff) | |
Merged in viewer-development changes
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 15 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_people.xml | 7 |
2 files changed, 12 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 3ead67ca57..a7d1aa963c 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -135,6 +135,14 @@ name="login_panel_holder" width="1024"/> + <debug_view follows="all" + left="0" + top="0" + mouse_opaque="false" + height="500" + name="DebugView" + width="1024"/> + <panel follows="all" height="500" left="0" @@ -154,13 +162,6 @@ top="0" width="1024"/> </panel> - <debug_view follows="all" - left="0" - top="0" - mouse_opaque="false" - height="500" - name="DebugView" - width="1024"/> </layout_panel> </layout_stack> <panel mouse_opaque="false" 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" |