EXT-1425 Revert floatercrammed region/estate to floater, merge changes since June - Added _layout to crammed files for future sidepanel inclusion

8 files changed, 1158 insertions, 772 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index e045b811f2..3fadc15616 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  height="512"
+ help_topic="regioninfo"
  layout="topleft"
  name="regioninfo"
- help_topic="regioninfo"
  save_rect="true"
  title="Region/Estate"
- width="280">
+ width="480">
     <tab_container
      bottom="512"
      follows="left|right|top|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index 01fbc81c32..b3147f5e6b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="350"
+ height="320"
  label="Covenant"
  layout="topleft"
  left="0"
  name="Covenant"
  top="320"
- width="280">
+ width="480">
     <panel.string
      name="can_resell">
         Purchased land in this region may be resold.
@@ -45,14 +45,14 @@
      mouse_opaque="false"
      name="estate_name_lbl"
      top_pad="5"
-     width="75">
+     width="100">
         Name:
     </text>
     <text
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="0"
+     left_pad="10"
      mouse_opaque="false"
      name="estate_name_text"
      top_delta="0"
@@ -67,41 +67,40 @@
      mouse_opaque="false"
      name="estate_owner_lbl"
      top_pad="5"
-     width="75">
+     width="100">
         Owner:
     </text>
     <text
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="0"
+     left_pad="10"
      mouse_opaque="false"
      name="estate_owner_text"
      top_delta="0"
      width="150">
         (none)
     </text>
-
-    <text 
+    <text
      follows="left|top"
-     height="20" 
+     height="20"
      layout="topleft"
      left="10"
-     mouse_opaque="false" 
-     name="estate_cov_lbl" 
+     mouse_opaque="false"
+     name="estate_cov_lbl"
      top_pad="5"
-     width="75">
+     width="100">
         Covenant:
     </text>
     <text
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="0"
+     left_pad="10"
      mouse_opaque="false"
      name="covenant_timestamp_text"
      top_delta="0"
-     width="167">
+     width="308">
         Last Modified Wed Dec 31 16:00:00 1969
     </text>
     <button
@@ -120,12 +119,12 @@
      follows="left|top"
      height="100"
      layout="topleft"
-     left="80"
+     left="110"
      max_length="65535"
      name="covenant_editor"
      top_delta="30"
      handle_edit_keys_directly="true"
-     width="193"
+     width="340"
      word_wrap="true">
         There is no Covenant provided for this Estate.
     </text_editor>
@@ -135,7 +134,7 @@
      height="18"
      label="Reset"
      layout="topleft"
-     left_delta="75"
+     left_delta="250"
      name="reset_covenant"
      top_pad="5"
      width="90" />
@@ -144,12 +143,11 @@
      follows="left|top"
      height="20"
      layout="topleft"
-     left="85"
+     left="120"
      name="covenant_help_text"
      top_pad="10"
-     width="190">
-        Changes to the covenant will show
-on all parcels in the estate.
+     width="460">
+        Changes to the covenant will show on all parcels in the estate.
     </text>
     <text
      follows="left|top"
@@ -157,10 +155,10 @@ on all parcels in the estate.
      layout="topleft"
      left_delta="0"
      name="covenant_instructions"
-     top_pad="15"
-     width="190">
+     top_pad="5"
+     width="465">
         Drag and drop a notecard to change
-the Covenant for this Estate.
+        the Covenant for this Estate.
     </text>
 
     <text
@@ -171,7 +169,7 @@ the Covenant for this Estate.
      left="5"
      mouse_opaque="false"
      name="region_section_lbl"
-     top_pad="10"
+     top_pad="5"
      width="100">
         Region
     </text>
@@ -183,19 +181,19 @@ the Covenant for this Estate.
      mouse_opaque="false"
      name="region_name_lbl"
      top_pad="5"
-     width="75">
+     width="100">
         Name:
     </text>
     <text
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="0"
+     left_pad="10"
      mouse_opaque="false"
      name="region_name_text"
      top_delta="0"
      width="150">
-        leyla
+        Erica
     </text>
     <text
      follows="left|top"
@@ -205,14 +203,14 @@ the Covenant for this Estate.
      mouse_opaque="false"
      name="region_landtype_lbl"
      top_pad="5"
-     width="75">
+     width="100">
         Type:
     </text>
     <text
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="0"
+     left_pad="10"
      mouse_opaque="false"
      name="region_landtype_text"
      top_delta="0"
@@ -227,14 +225,14 @@ the Covenant for this Estate.
      mouse_opaque="false"
      name="region_maturity_lbl"
      top_pad="5"
-     width="75">
+     width="100">
         Rating:
     </text>
     <text
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="0"
+     left_pad="10"
      mouse_opaque="false"
      name="region_maturity_text"
      top_delta="0"
@@ -249,20 +247,19 @@ the Covenant for this Estate.
      mouse_opaque="false"
      name="resellable_lbl"
      top_pad="5"
-     width="75">
+     width="100">
         Resale:
     </text>
     <text
      follows="left|top"
      height="20"
      layout="topleft"
-     left_pad="0"
+     left_pad="10"
      mouse_opaque="false"
      name="resellable_clause"
      top_delta="0"
-     width="190">
-        Land in this region may not be
-resold.
+     width="330">
+        Land in this region may not be resold.
     </text>
     <text
      follows="left|top"
@@ -271,21 +268,20 @@ resold.
      left="10"
      mouse_opaque="false"
      name="changeable_lbl"
-     top_pad="10"
-     width="75">
+     top_pad="5"
+     width="100">
         Subdivide:
     </text>
     <text
      follows="left|top"
      height="30"
      layout="topleft"
-     left_pad="0"
+     left_pad="10"
      mouse_opaque="false"
      name="changeable_clause"
      top_delta="0"
-     width="190">
-        Land in this region may not be
-joined/subdivided.
+     width="330">
+        Land in this region may not be joined/subdivided.
     </text>
 
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 54664bb6b9..78e5678455 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -8,7 +8,7 @@
  left="0"
  name="Debug"
  top="320"
- width="280">
+ width="480">
     <text
      follows="left|top"
      font="SansSerif"
@@ -28,7 +28,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="220">
+     width="400">
         unknown
     </text>
     <check_box
@@ -91,15 +91,16 @@
     <button
      enabled="false"
      follows="left|top"
-     height="20"
      font="SansSerifSmall"
+     height="20"
      label="Apply"
      layout="topleft"
      left="60"
      name="apply_btn"
      top="100"
-     width="80" />
+     width="100" />
     <text
+
      follows="left|top"
      height="20"
      layout="topleft"
@@ -110,16 +111,18 @@
         Object Return
     </text>
     <text
+
      follows="left|top"
      height="20"
      layout="topleft"
-     left="20"
+     left="30"
      name="resident_text_lbl"
      top="175"
      width="60">
         Resident:
     </text>
     <line_editor
+
      border_style="line"
      border_thickness="1"
      enabled="false"
@@ -130,7 +133,7 @@
      mouse_opaque="false"
      name="target_avatar_name"
      top_delta="-2"
-     width="115">
+     width="180">
         (none)
     </line_editor>
     <button
@@ -143,17 +146,17 @@
      name="choose_avatar_btn"
      top_delta="0"
      width="70" />
-   <text
+    <text
      follows="left|top"
      height="20"
      layout="topleft"
-     left="20"
+     left="30"
      name="options_text_lbl"
      top="198"
      width="60">
         Options:
     </text>
-    <check_box
+     <check_box
      height="20"
      label="With scripts"
      layout="topleft"
@@ -192,15 +195,15 @@
      width="80" />
     <button
      follows="left|top"
-     height="20"
      font="SansSerifSmall"
+     height="20"
      label="Get Top Colliders..."
      layout="topleft"
      left="10"
      name="top_colliders_btn"
      tool_tip="List of objects experiencing the most potential collisions"
      top="313"
-     width="130" />
+     width="150" />
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -213,15 +216,15 @@
      width="18" />
     <button
      follows="left|top"
-     height="20"
      font="SansSerifSmall"
+     height="20"
      label="Get Top Scripts..."
      layout="topleft"
      left="10"
      name="top_scripts_btn"
      tool_tip="List of objects spending the most time running scripts"
      top_pad="5"
-     width="130" />
+     width="150" />
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -234,15 +237,15 @@
      width="18" />
     <button
      follows="left|top"
-     height="20"
      font="SansSerifSmall"
+     height="20"
      label="Restart Region"
      layout="topleft"
      left="10"
      name="restart_btn"
      tool_tip="Give 2 minute countdown and restart region"
      top_pad="5"
-     width="110" />
+     width="130" />
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -255,13 +258,13 @@
      width="18" />
     <button
      follows="left|top"
-     height="20"
      font="SansSerifSmall"
+     height="20"
      label="Delay Restart"
      layout="topleft"
      left="10"
      name="cancel_restart_btn"
      tool_tip="Delay region restart by one hour"
      top_pad="5"
-     width="110" />
+     width="130" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 6e837bcfee..afcefcbd3b 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -2,474 +2,518 @@
 <panel
  border="false"
  follows="top|left"
- height="512"
- top="0"
- left="0"
- name="EstateWrapper"
+ height="320"
  label="Estate"
  layout="topleft"
- width="313">
-    <panel
-     follows="top|left"
-     height="950"
-     label="Estate"
+ left="0"
+ name="Estate"
+ top="320"
+ width="480">
+    <panel.string
+     name="email_unsupported">
+        Feature unsupported
+    </panel.string>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="32"
      layout="topleft"
-     name="Estate"
+     left="10"
+     name="estate_help_text"
+     top="14"
      width="313">
-      <panel.string
-       name="email_unsupported">
-        Feature unsupported
-      </panel.string>
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="32"
-       layout="topleft"
-       left="0"
-       name="estate_help_text"
-       top="5"
-       width="313">
         Changes to settings on this tab will affect all
-        regions in the estate.
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-
-       layout="topleft"
-       name="estate_text"
-       top_pad="5"
-       width="313">
+regions in the estate.
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="estate_text"
+     top_pad="2"
+     width="80">
         Estate:
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       layout="topleft"
-       name="estate_name"
-       top_pad="5"
-       width="313">
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="estate_name"
+     top_delta="16"
+     width="150">
         (unknown)
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       layout="topleft"
-       left_delta="0"
-       name="owner_text"
-       top_pad="5"
-       width="313">
-        Estate Owner:
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       layout="topleft"
-       name="estate_owner"
-       top_pad="5"
-       width="313">
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="owner_text"
+     top_pad="2"
+     width="80">
+        Estate owner:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="estate_owner"
+     top_delta="16"
+     width="150">
         (unknown)
-      </text>
-      <check_box
-       height="23"
-       label="Use Global Time"
-       layout="topleft"
-       left="12"
-       name="use_global_time_check"
-       top="102"
-       width="200" />
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_pad="20"
-       name="use_global_time_help"
-       top_delta="2"
-       width="18" />
-      <check_box
-       height="23"
-       label="Fixed Sun"
-       layout="topleft"
-       left="12"
-       name="fixed_sun_check"
-       top_pad="10"
-       width="100" />
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_pad="120"
-       name="fixed_sun_help"
-       top_delta="2"
-       width="18" />
-      <icon
-       height="23"
-       image_name="icon_day_cycle.tga"
-       layout="topleft"
-       left="47"
-       name="daycycle"
-       top_pad="10"
-       width="165" />
-      <slider
-       follows="left|top"
-       height="23"
-       increment="0.001"
-       label="Phase"
-       layout="topleft"
-       left="12"
-       max_val="30"
-       min_val="6"
-       name="sun_hour_slider"
-       show_text="false"
-       top_pad="10"
-       width="200" />
-      <check_box
-       height="23"
-       label="Allow Public Access"
-       layout="topleft"
-       left_delta="0"
-       name="externally_visible_check"
-       top_pad="10" />
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_pad="20"
-       name="externally_visible_help"
-       top_delta="2"
-       width="18" />
-      <text
-       type="string"
-       length="1"
-       follows="top|left"
-       height="16"
-       layout="topleft"
-       left="32"
-       name="Only Allow"
-       top_pad="5"
-       width="278">
+    </text>
+    <view_border
+     bevel_style="in"
+     follows="top|left"
+     height="290"
+     layout="topleft"
+     left_delta="-4"
+     top_pad="5"
+     width="250" />
+    <check_box
+     height="20"
+     label="Use Global Time"
+     layout="topleft"
+     left="12"
+     name="use_global_time_check"
+     top="132"
+     width="200" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="20"
+     name="use_global_time_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Fixed Sun"
+     layout="topleft"
+     left="12"
+     name="fixed_sun_check"
+     top="152"
+     width="100" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="120"
+     name="fixed_sun_help"
+     top_delta="2"
+     width="18" />
+    <icon
+     height="20"
+     image_name="icon_day_cycle.tga"
+     layout="topleft"
+     left="47"
+     name="daycycle"
+     top="177"
+     width="165" />
+    <slider
+     follows="left|top"
+     height="20"
+     increment="0.001"
+     label="Phase"
+     layout="topleft"
+     left="12"
+     max_val="30"
+     min_val="6"
+     name="sun_hour_slider"
+     show_text="false"
+     top="202"
+     width="200" />
+    <check_box
+     height="20"
+     label="Allow Public Access"
+     layout="topleft"
+     left_delta="0"
+     name="externally_visible_check"
+     top_pad="6"
+     width="200" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="20"
+     name="externally_visible_help"
+     top_delta="2"
+     width="18" />
+    <text
+     type="string"
+     length="1"
+     follows="top|left"
+     height="16"
+     layout="topleft"
+     left="32"
+     name="Only Allow"
+     top="250"
+     width="278">
         Restrict Access To:
-      </text>
-      <check_box
-       follows="top|left"
-       height="16"
-       label="Residents with payment info on file"
-       layout="topleft"
-       left_delta="0"
-       name="limit_payment"
-       tool_tip="Ban unidentified residents."
-       top_pad="2"
-       width="278" />
-      <check_box
-       follows="top|left"
-       height="16"
-       label="Age-verified adults"
-       layout="topleft"
-       left_delta="0"
-       name="limit_age_verified"
-       tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
-       top_pad="2"
-       width="278" />
-      <check_box
-       height="23"
-       label="Allow Voice Chat"
-       layout="topleft"
-       left="12"
-       name="voice_chat_check"
-       top_pad="5"
-       width="200" />
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_pad="20"
-       name="voice_chat_help"
-       top_delta="2"
-       width="18" />
-      <check_box
-       height="23"
-       label="Allow Direct Teleport"
-       layout="topleft"
-       left="12"
-       name="allow_direct_teleport"
-       top_pad="0"
-       width="80" />
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_pad="140"
-       name="allow_direct_teleport_help"
-       top_delta="2"
-       width="18" />
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="23"
-       layout="topleft"
-       left="10"
-       name="abuse_email_text"
-       top_pad="5"
-       width="313">
+    </text>
+    <check_box
+     follows="top|left"
+     height="16"
+     label="Residents with payment info on file"
+     layout="topleft"
+     left_delta="0"
+     name="limit_payment"
+     tool_tip="Ban unidentified residents."
+     top_pad="2"
+     width="278" />
+    <check_box
+     follows="top|left"
+     height="16"
+     label="Age-verified adults"
+     layout="topleft"
+     left_delta="0"
+     name="limit_age_verified"
+     tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
+     top_pad="2"
+     width="278" />
+    <check_box
+     height="20"
+     label="Allow Voice Chat"
+     layout="topleft"
+     left="12"
+     name="voice_chat_check"
+     top="304"
+     width="200" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="20"
+     name="voice_chat_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Allow Direct Teleport"
+     layout="topleft"
+     left="12"
+     name="allow_direct_teleport"
+     top_pad="4"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="140"
+     name="allow_direct_teleport_help"
+     top_delta="2"
+     width="18" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="abuse_email_text"
+     top_pad="5"
+     width="180">
         Abuse email address:
-      </text>
-      <line_editor
-       follows="top|left"
-       height="19"
-       layout="topleft"
-       left="15"
-       name="abuse_email_address"
-       top_pad="0"
-       width="250" />
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_pad="12"
-       name="abuse_email_address_help"
-       top_delta="0"
-       width="18" />
-      <button
-       enabled="false"
-       follows="left|top"
-       height="23"
-       label="Apply"
-       layout="topleft"
-       name="apply_btn"
-       right="250"
-       top_pad="4"
-       width="90" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Send Message To Estate..."
-       layout="topleft"
-       left="8"
-       name="message_estate_btn"
-       top_pad="5"
-       width="250" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Kick User from Estate..."
-       layout="topleft"
-       left="8"
-       name="kick_user_from_estate_btn"
-       top_pad="5"
-       width="250" />
-      <text
-       type="string"
-       length="1"
-       top="490"
-       follows="left|top"
-       height="23"
-       layout="topleft"
-       name="estate_manager_label"
-       left="8"
-       width="200">
+    </text>
+    <line_editor
+     follows="top|left"
+     height="19"
+     layout="topleft"
+     left="15"
+     name="abuse_email_address"
+     top_pad="5"
+     width="205" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="12"
+     name="abuse_email_address_help"
+     top_dekta="0"
+     width="18" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     name="apply_btn"
+     right="250"
+     top_pad="4"
+     width="90" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Send Message To Estate..."
+     layout="topleft"
+     left="8"
+     name="message_estate_btn"
+     top_pad="5"
+     width="250" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Kick User from Estate..."
+     layout="topleft"
+     left="8"
+     name="kick_user_from_estate_btn"
+     top_pad="5"
+     width="250" />
+
+    <text
+     type="string"
+     length="1"
+     bottom="34"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     name="estate_manager_label"
+     right="470"
+     width="200">
         Estate Managers:
-      </text>
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_delta="232"
-       name="estate_manager_help"
-       top_delta="-1"
-       width="18" />
-      <name_list
-       follows="left|top"
-       height="60"
-       layout="topleft"
-       left="8"
-       multi_select="true"
-       name="estate_manager_name_list"
-       top_pad="0"
-       width="300" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Add..."
-       layout="topleft"
-       left="8"
-       name="add_estate_manager_btn"
-       top_pad="5"
-       width="90" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Remove..."
-       layout="topleft"
-       name="remove_estate_manager_btn"
-       left_pad="70"
-       top_delta="0"
-       width="90" />
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="23"
-       layout="topleft"
-       left="8"
-       name="allow_resident_label"
-       top_pad="5"
-       width="200">
+    </text>
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_delta="182"
+     name="estate_manager_help"
+     top_delta="-1"
+     width="18" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="60"
+     layout="topleft"
+     right="470"
+     top_pad="5"
+     width="200" />
+    <name_list
+     follows="left|top"
+     height="60"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="estate_manager_name_list"
+     top_delta="0"
+     width="200" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Remove..."
+     layout="topleft"
+     name="remove_estate_manager_btn"
+     right="470"
+     top_pad="5"
+     width="90" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Add..."
+     layout="topleft"
+     left_delta="-110"
+     name="add_estate_manager_btn"
+     top_delta="0"
+     width="90" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="allow_resident_label"
+     top_pad="5"
+     width="200">
         Allowed Residents:
-      </text>
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_delta="232"
-       name="allow_resident_help"
-       top_delta="-1"
-       width="18" />
-      <name_list
-       follows="left|top"
-       height="60"
-       layout="topleft"
-       left="8"
-       multi_select="true"
-       name="allowed_avatar_name_list"
-       top_pad="0"
-       width="300" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Add..."
-       layout="topleft"
-       left="8"
-       name="add_allowed_avatar_btn"
-       top_pad="5"
-       width="90" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Remove..."
-       layout="topleft"
-       name="remove_allowed_avatar_btn"
-       left_pad="70"
-       top_delta="0"
-       width="90" />
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="23"
-       layout="topleft"
-       left="8"
-       name="allow_group_label"
-       top_pad="5"
-       width="200">
+    </text>
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_delta="182"
+     name="allow_resident_help"
+     top_delta="-1"
+     width="18" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="60"
+     layout="topleft"
+     right="470"
+     top_pad="5"
+     width="200" />
+    <name_list
+     follows="left|top"
+     height="60"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="allowed_avatar_name_list"
+     top_delta="0"
+     width="200" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Remove..."
+     layout="topleft"
+     name="remove_allowed_avatar_btn"
+     right="470"
+     top_pad="5"
+     width="90" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Add..."
+     layout="topleft"
+     left_delta="-110"
+     name="add_allowed_avatar_btn"
+     top_delta="0"
+     width="90" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="allow_group_label"
+     top_pad="5"
+     width="200">
         Allowed Groups:
-      </text>
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_delta="232"
-       name="allow_group_help"
-       top_delta="-1"
-       width="18" />
-      <name_list
-       follows="left|top"
-       height="60"
-       layout="topleft"
-       left="8"
-       multi_select="true"
-       name="allowed_group_name_list"
-       top_pad="0"
-       width="300" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Add..."
-       layout="topleft"
-       left="8"
-       name="add_allowed_group_btn"
-       top_pad="5"
-       width="90" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Remove..."
-       layout="topleft"
-       name="remove_allowed_group_btn"
-       left_pad="70"
-       top_delta="0"
-       width="90" />
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="23"
-       layout="topleft"
-       left="8"
-       name="ban_resident_label"
-       top_pad="5"
-       width="200">
+    </text>
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_delta="182"
+     name="allow_group_help"
+     top_delta="-1"
+     width="18" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="60"
+     layout="topleft"
+     right="470"
+     top_pad="5"
+     width="200" />
+    <name_list
+     follows="left|top"
+     height="60"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="allowed_group_name_list"
+     top_delta="0"
+     width="200" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Remove..."
+     layout="topleft"
+     name="remove_allowed_group_btn"
+     right="470"
+     top_pad="5"
+     width="90" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Add..."
+     layout="topleft"
+     left_delta="-110"
+     name="add_allowed_group_btn"
+     top_delta="0"
+     width="90" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_delta="0"
+     name="ban_resident_label"
+     top_pad="5"
+     width="200">
         Banned Residents:
-      </text>
-      <button
-       follows="left|top"
-       font="SansSerifSmall"
-       height="18"
-       label="?"
-       layout="topleft"
-       left_delta="232"
-       name="ban_resident_help"
-       top_delta="-1"
-       width="18" />
-      <name_list
-       follows="left|top"
-       height="60"
-       layout="topleft"
-       left="8"
-       multi_select="true"
-       name="banned_avatar_name_list"
-       top_pad="0"
-       width="300" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Add..."
-       layout="topleft"
-       left="8"
-       name="add_banned_avatar_btn"
-       top_pad="5"
-       width="90" />
-      <button
-       follows="left|top"
-       height="23"
-       label="Remove..."
-       layout="topleft"
-       name="remove_banned_avatar_btn"
-       left_pad="70"
-       top_delta="0"
-       width="90" />
-    </panel>
+    </text>
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_delta="182"
+     name="ban_resident_help"
+     top_delta="-1"
+     width="18" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="60"
+     layout="topleft"
+     right="470"
+     top_pad="5"
+     width="200" />
+    <name_list
+     follows="left|top"
+     height="60"
+     layout="topleft"
+     left_delta="0"
+     multi_select="true"
+     name="banned_avatar_name_list"
+     top_delta="0"
+     width="200" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Remove..."
+     layout="topleft"
+     name="remove_banned_avatar_btn"
+     right="470"
+     top_pad="5"
+     width="90" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Add..."
+     layout="topleft"
+     left_delta="-110"
+     name="add_banned_avatar_btn"
+     top_delta="0"
+     width="90" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 9b9c62dbf9..160ae96fc4 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="360"
+ height="320"
  label="Region"
  layout="topleft"
  left="0"
  name="General"
- top="360"
- width="280">
+ top="320"
+ width="480">
     <text
      follows="left|top"
      font="SansSerif"
@@ -28,7 +28,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="200">
+     width="400">
         unknown
     </text>
     <text
@@ -279,7 +279,7 @@
          label="PG"
          name="PG"
          value="13" />
-    </combo_box> 
+    </combo_box>
     <button
      follows="left|top"
      font="SansSerifSmall"
@@ -300,10 +300,10 @@
      name="apply_btn"
      top="320"
      width="100">
-        <button.commit_callback
+    <button.commit_callback
          function="RegionInfo.Cancel" />
     </button>
-   <button
+    <button
      follows="left|top"
      height="20"
      label="Teleport Home One User..."
@@ -335,8 +335,8 @@
      height="20"
      label="Manage Telehub..."
      layout="topleft"
-     left_delta="0"
+     left="250"
      name="manage_telehub_btn"
-     top_pad="20"
-     width="150" /> 
+     top="70"
+     width="150" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
new file mode 100644
index 0000000000..9b9c62dbf9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="top|left"
+ height="360"
+ label="Region"
+ layout="topleft"
+ left="0"
+ name="General"
+ top="360"
+ width="280">
+    <text
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="region_text_lbl"
+     top="10"
+     width="100">
+        Region:
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="50"
+     name="region_text"
+     top_delta="0"
+     width="200">
+        unknown
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="version_channel_text_lbl"
+     top="30"
+     width="100">
+        Version:
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="50"
+     name="version_channel_text"
+     top_delta="0"
+     width="200">
+        unknown
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="region_type_lbl"
+     top="50"
+     width="100">
+        Type:
+    </text>
+    <text
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="50"
+     name="region_type"
+     top_delta="0"
+     width="200">
+        unknown
+    </text>
+    <check_box
+     height="20"
+     label="Block Terraform"
+     layout="topleft"
+     left="10"
+     name="block_terraform_check"
+     top="70"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="115"
+     name="terraform_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Block Fly"
+     layout="topleft"
+     left="10"
+     name="block_fly_check"
+     top="90"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="115"
+     name="fly_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Allow Damage"
+     layout="topleft"
+     left="10"
+     name="allow_damage_check"
+     top="110"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="115"
+     name="damage_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Restrict Pushing"
+     layout="topleft"
+     left="10"
+     name="restrict_pushobject"
+     top="130"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="115"
+     name="restrict_pushobject_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Allow Land Resell"
+     layout="topleft"
+     left="10"
+     name="allow_land_resell_check"
+     top="160"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="115"
+     name="land_resell_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Allow Land Join/Divide"
+     layout="topleft"
+     left="10"
+     name="allow_parcel_changes_check"
+     top="180"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="115"
+     name="parcel_changes_help"
+     top_delta="2"
+     width="18" />
+    <check_box
+     height="20"
+     label="Block Land Show in Search"
+     layout="topleft"
+     left="10"
+     name="block_parcel_search_check"
+     tool_tip="Let people see this region and its parcels in search results"
+     top="200"
+     width="80" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="115"
+     name="parcel_search_help"
+     top_delta="2"
+     width="18" />
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="1"
+     label="Agent Limit"
+     label_width="97"
+     layout="topleft"
+     left="10"
+     max_val="100"
+     min_val="1"
+     name="agent_limit_spin"
+     top="240"
+     width="170" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="25"
+     name="agent_limit_help"
+     top_delta="2"
+     width="18" />
+    <spinner
+     follows="left|top"
+     height="20"
+     increment="0.5"
+     label="Object Bonus"
+     label_width="97"
+     layout="topleft"
+     left="10"
+     max_val="10"
+     min_val="1"
+     name="object_bonus_spin"
+     top="260"
+     width="170" />
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="25"
+     name="object_bonus_help"
+     top_delta="2"
+     width="18" />
+    <text
+     follows="left|top"
+     height="20"
+     label="Maturity"
+     layout="topleft"
+     left="10"
+     name="access_text"
+     top="290"
+     width="100">
+        Rating:
+    </text>
+    <combo_box
+     height="20"
+     label="Mature"
+     layout="topleft"
+     left_delta="100"
+     name="access_combo"
+     top_delta="0"
+     width="85">
+        <combo_box.item
+         label="Adult"
+         name="Adult"
+         value="42" />
+        <combo_box.item
+         label="Mature"
+         name="Mature"
+         value="21" />
+        <combo_box.item
+         label="PG"
+         name="PG"
+         value="13" />
+    </combo_box> 
+    <button
+     follows="left|top"
+     font="SansSerifSmall"
+     height="18"
+     label="?"
+     layout="topleft"
+     left_pad="10"
+     name="access_help"
+     top_delta="2"
+     width="18" />
+    <button
+     enabled="false"
+     follows="left|top"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     left="108"
+     name="apply_btn"
+     top="320"
+     width="100">
+        <button.commit_callback
+         function="RegionInfo.Cancel" />
+    </button>
+   <button
+     follows="left|top"
+     height="20"
+     label="Teleport Home One User..."
+     layout="topleft"
+     left="10"
+     name="kick_btn"
+     top_pad="10"
+     width="250" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Teleport Home All Users..."
+     layout="topleft"
+     left_delta="0"
+     name="kick_all_btn"
+     top_pad="3"
+     width="250" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Send Message To Region..."
+     layout="topleft"
+     left_delta="0"
+     name="im_btn"
+     top_pad="20"
+     width="200" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Manage Telehub..."
+     layout="topleft"
+     left_delta="0"
+     name="manage_telehub_btn"
+     top_pad="20"
+     width="150" /> 
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index a78a1ea98c..148d9500bb 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -2,13 +2,13 @@
 <panel
  border="true"
  follows="top|left"
- height="340"
+ height="320"
  label="Terrain"
  layout="topleft"
  left="0"
  name="Terrain"
  top="320"
- width="280">
+ width="480">
     <text
      follows="left|top"
      font="SansSerif"
@@ -28,7 +28,7 @@
      left_delta="50"
      name="region_text"
      top_delta="0"
-     width="200">
+     width="400">
         unknown
     </text>
     <spinner
@@ -101,9 +101,9 @@
      height="20"
      label="Use Estate Sun"
      layout="topleft"
-     left="15"
+     left="250"
      name="use_estate_sun_check"
-     top="105"
+     top="35"
      width="100" />
     <button
      follows="left|top"
@@ -111,7 +111,7 @@
      height="18"
      label="?"
      layout="topleft"
-     left_pad="85"
+     left_pad="70"
      name="use_estate_sun_help"
      top_delta="2"
      width="18" />
@@ -119,9 +119,9 @@
      height="20"
      label="Fixed Sun"
      layout="topleft"
-     left="15"
+     left="250"
      name="fixed_sun_check"
-     top_pad="0"
+     top="55"
      width="100" />
     <button
      follows="left|top"
@@ -129,7 +129,7 @@
      height="18"
      label="?"
      layout="topleft"
-     left_pad="85"
+     left_pad="70"
      name="fixed_sun_help"
      top_delta="2"
      width="18" />
@@ -137,9 +137,9 @@
      height="20"
      image_name="icon_day_cycle.tga"
      layout="topleft"
-     left="50"
+     left="285"
      name="daycycle"
-     top_delta="25"
+     top="80"
      width="165" />
     <slider
      follows="left|top"
@@ -147,12 +147,12 @@
      increment="0.001"
      label="Phase"
      layout="topleft"
-     left="15"
+     left="250"
      max_val="30"
      min_val="6"
      name="sun_hour_slider"
      show_text="false"
-     top_delta="30"
+     top="105"
      width="200" />
     <button
      enabled="false"
@@ -160,18 +160,18 @@
      height="20"
      label="Apply"
      layout="topleft"
-     left="130"
+     left="350"
      name="apply_btn"
-     top_delta="30"
+     top="135"
      width="90" />
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="210"
+     height="130"
      layout="topleft"
      left="8"
      top="30"
-     width="240" />
+     width="460" />
     <button
      follows="left|top"
      height="20"
@@ -180,7 +180,7 @@
      left_delta="2"
      name="download_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top_pad="15"
+     top_pad="60"
      width="170" />
     <button
      follows="left|top"
@@ -200,7 +200,7 @@
      left="10"
      name="upload_raw_btn"
      tool_tip="Available only to estate owners, not managers"
-     top_pad="0"
+     top="243"
      width="170" />
     <button
      follows="left|top"
@@ -220,7 +220,7 @@
      left="10"
      name="bake_terrain_btn"
      tool_tip="Set current terrain as mid-point for raise/lower limits"
-     top_pad="15"
+     top="283"
      width="100" />
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index 404e1b8907..5089064c07 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -2,231 +2,235 @@
 <panel
  border="true"
  follows="top|left"
- height="512"
- name="TextureWrapper"
+ height="320"
  label="Ground Textures"
  layout="topleft"
- width="280">
-  <scroll_container
-   follows="top|left|right|bottom"
-   height="508"
-   name="container1"
-   layout="topleft"
-   width="280">
-    <panel
-     follows="top|left"
-     height="575"
-     label="Ground Textures"
+ left="0"
+ name="Textures"
+ top="320"
+ width="480">
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
      layout="topleft"
-     name="Textures"
-     width="258">
-      <text
-       follows="left|top"
-       font="SansSerif"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="region_text_lbl"
-       top="10"
-       width="100">
+     left="10"
+     name="region_text_lbl"
+     top="10"
+     width="100">
         Region:
-      </text>
-      <text
-       follows="left|top"
-       font="SansSerif"
-       height="20"
-       layout="topleft"
-       left_delta="50"
-       name="region_text"
-       top_delta="0"
-       width="200">
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     left_delta="50"
+     name="region_text"
+     top_delta="0"
+     width="400">
         unknown
-      </text>
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="detail_texture_text"
-       top="36"
-       width="300">
-        Terrain Textures
-        (requires 512x512, 24 bit .tga files)
-      </text>
-      <texture_picker
-       follows="left|top"
-       height="100"
-       layout="topleft"
-       left_delta="0"
-       name="texture_detail_0"
-       top_delta="30"
-       width="100" />
-      <texture_picker
-       follows="left|top"
-       height="100"
-       layout="topleft"
-       left_pad="10"
-       name="texture_detail_1"
-       top_delta="0"
-       width="100" />
-      <texture_picker
-       follows="left|top"
-       height="100"
-       layout="topleft"
-       left="10"
-       name="texture_detail_2"
-       top_delta="105"
-       width="100" />
-      <texture_picker
-       follows="left|top"
-       height="100"
-       layout="topleft"
-       left_pad="10"
-       name="texture_detail_3"
-       top_delta="0"
-       width="100" />
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="height_text_lbl"
-       top="157"
-       width="65">
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="detail_texture_text"
+     top="36"
+     width="300">
+        Terrain Textures (requires 512x512, 24 bit .tga files)
+    </text>
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_delta="0"
+     name="texture_detail_0"
+     top_delta="20"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_1"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_2"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="texture_detail_3"
+     top_delta="0"
+     width="100" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl"
+     top="146"
+     width="65">
         1 (Low)
-      </text>
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left_pad="45"
-       name="height_text_lbl2"
-       top_delta="0"
-       width="100">
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="45"
+     name="height_text_lbl2"
+     top_delta="0"
+     width="100">
         2
-      </text>
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="height_text_lbl3"
-       top_delta="105"
-       width="100">
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl3"
+     top_delta="0"
+     width="100">
         3
-      </text>
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left_pad="10"
-       name="height_text_lbl4"
-       top_delta="0"
-       width="100">
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl4"
+     top_delta="0"
+     width="100">
         4 (High)
-      </text>
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left="10"
-       name="height_text_lbl5"
-       top_delta="25"
-       width="300">
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl5"
+     top="186"
+     width="300">
         Texture Elevation Ranges
-      </text>
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left="51"
-       name="height_text_lbl6"
-       top_delta="20"
-       width="100">
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="51"
+     name="height_text_lbl6"
+     top="201"
+     width="100">
         Southwest
-      </text>
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left_pad="10"
-       name="height_text_lbl7"
-       top_delta="0"
-       width="100">
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl7"
+     top_delta="0"
+     width="100">
         Northwest
-      </text>
-      <spinner
-        follows="left|top"
-        height="20"
-        increment="0.5"
-        label="Low"
-        label_width="37"
-        layout="topleft"
-        left="10"
-        max_val="500"
-        min_val="-500"
-        name="height_start_spin_0"
-        top_delta="20"
-        width="100" />
-      <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="Low"
-       label_width="37"
-       layout="topleft"
-       left_pad="10"
-       max_val="500"
-       min_val="-500"
-       name="height_start_spin_1"
-       top_delta="0"
-       width="100" />
-      <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="High"
-       label_width="37"
-       layout="topleft"
-       left="10"
-       max_val="500"
-       min_val="-500"
-       name="height_range_spin_0"
-       top_delta="20"
-       width="100" />
-      <spinner
-       follows="left|top"
-       height="20"
-       increment="0.5"
-       label="High"
-       label_width="37"
-       layout="topleft"
-       left_pad="10"
-       max_val="500"
-       min_val="-500"
-       name="height_range_spin_1"
-       top_delta="0"
-       width="100" />
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left="51"
-       name="height_text_lbl8"
-       top_delta="30"
-       width="100">
+    </text>
+   <spinner
+    follows="left|top"
+    height="20"
+    increment="0.5"
+    label="Low"
+    label_width="37"
+    layout="topleft"
+    left="10"
+    max_val="500"
+    min_val="-500"
+    name="height_start_spin_0"
+    top_delta="20"
+    width="100" />
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="Low"
+   label_width="37"
+   layout="topleft"
+   left_pad="10"
+   max_val="500"
+   min_val="-500"
+   name="height_start_spin_1"
+   top_delta="0"
+   width="100" />
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="High"
+   label_width="37"
+   layout="topleft"
+   left="10"
+   max_val="500"
+   min_val="-500"
+   name="height_range_spin_0"
+   top_delta="20"
+   width="100" />
+  <spinner
+   follows="left|top"
+   height="20"
+   increment="0.5"
+   label="High"
+   label_width="37"
+   layout="topleft"
+   left_pad="10"
+   max_val="500"
+   min_val="-500"
+   name="height_range_spin_1"
+   top_delta="0"
+   width="100" />
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl8"
+     top_delta="0"
+     width="100">
         Southeast
-      </text>
-      <text
-       follows="left|top"
-       height="20"
-       layout="topleft"
-       left_pad="10"
-       name="height_text_lbl9"
-       top_delta="0"
-       width="100">
+    </text>
+    <text
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left_pad="10"
+     name="height_text_lbl9"
+     top_delta="0"
+     width="100">
         Northeast
-      </text>
+    </text>
       <spinner
        follows="left|top"
        height="20"
@@ -303,17 +307,14 @@
         and the HIGH value is the MINIMUM
         height of Texture #4.
       </text>
-
-      <button
-       enabled="false"
-       follows="left|bottom"
-       height="20"
-       label="Apply"
-       layout="topleft"
-       left="120"
-       name="apply_btn"
-       top_delta="60"
-       width="100" />
-    </panel>
-  </scroll_container>
+    <button
+     enabled="false"
+     follows="left|bottom"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     left="350"
+     name="apply_btn"
+     top="290"
+     width="100" />
 </panel>