Second Life viewer sources 1.18.4.0-RC

1 files changed, 28 insertions, 30 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
index a914422..7410c17 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
@@ -2,65 +2,61 @@
 <panel border="true" bottom="0" follows="top|left" height="320" label="Covenant" left="0" 
         name="Covenant" width="480">
         <text bottom="-30" follows="left|top" font="SansSerifSmall" height="20" left="10"
-             name="covenant_help_text" width="400">
+             name="covenant_help_text" width="460">
                 Changes to the covenant information will show on all parcels in the estate.
         </text>
         <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
              left="10" name="region_name_lbl" width="75">
                 Region:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
-             font="SansSerifSmall" height="20" left="85" name="region_name_text"
+        <text bg_readonly_color="clear" bottom_delta="-14" follows="left|top"
+             font="SansSerifSmall" height="20" left_delta="0" name="region_name_text"
              text_readonly_color="white" width="130">
                 (unknown)
         </text>
-        <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
+        <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
              left="10" name="estate_name_lbl" width="75">
                 Estate:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
-             font="SansSerifSmall" height="20" left="85" name="estate_name_text"
+        <text bg_readonly_color="clear" bottom_delta="-14" follows="left|top"
+             font="SansSerifSmall" height="20" left_delta="0" name="estate_name_text"
              text_readonly_color="white" width="130">
                 (unknown)
         </text>
-        <text bottom_delta="20" follows="left|top" font="SansSerifSmall" height="20"
-             left="290" name="covenent_instructions" width="200">
-                Drag and drop a notecard
-to change the Covenant
-for this Estate.
-        </text>
-        <button bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="18"
-             label="?" left="370" name="covenant_help" width="18" />
-        <button bottom_delta="28" follows="left|top" font="SansSerifSmall" height="18"
-             label="Reset" left="190" name="reset_covenant" width="90" />
-        <text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="20"
-             left="10" name="estate_owner_lbl" width="75">
+        <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+             left="10" name="estate_owner_lbl" width="300">
                 Estate Owner:
         </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
-             font="SansSerifSmall" height="20" left="85" name="estate_owner_text"
-             text_readonly_color="white" width="130">
+        <text bg_readonly_color="clear" bottom_delta="-14" follows="left|top"
+             font="SansSerifSmall" height="20" left_delta="0" name="estate_owner_text"
+             text_readonly_color="white" width="120">
                 (unknown)
         </text>
-        <text bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="20"
-             left="200" name="covenant_timestamp_text" width="300" />
-        <text bg_readonly_color="clear" bottom_delta="-30" follows="left|top"
-             font="SansSerif" height="20" left="52" name="resellable_clause"
+        <text bg_readonly_color="clear" bottom_delta="-28" follows="left|top"
+             font="SansSerif" height="20" left_delta="0" name="resellable_clause"
              text_readonly_color="white" width="300">
                 Purchased land in this region may or may not be resold.
         </text>
         <text bg_readonly_color="clear" bottom_delta="-18" follows="left|top"
-             font="SansSerif" height="20" left="52" name="changeable_clause"
+             font="SansSerif" height="20" left_delta="0" name="changeable_clause"
              text_readonly_color="white" width="375">
                 Purchased land in this region may or may not be joined or subdivided.
         </text>
-        <text_editor bg_readonly_color="clear" bottom_delta="-320" enabled="false"
-             follows="left|top" font="SansSerifSmall" height="310" left="52"
+           <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16"
+             left_delta="0" name="covenent_instructions" width="440">
+                Drag and drop a notecard to change the Covenant for this Estate.
+        </text>
+        <text_editor bg_readonly_color="clear" bottom_delta="-242" enabled="false"
+             follows="left|top" font="SansSerifSmall" height="238" left_delta="0"
              max_length="65535" name="covenant_editor" text_readonly_color="white"
-             width="375" word_wrap="true">
+             width="460" word_wrap="true">
                 Loading...
         </text_editor>
-        <text hidden="true" name="can_resell">
+        <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
+             left_delta="0" name="covenant_timestamp_text" width="300" />
+        <button bottom_delta="-4" follows="left|top" font="SansSerifSmall" height="18"
+             label="Reset" right="470" name="reset_covenant" width="90" />
+        <text hidden="true" name="can_resell">
                 Purchased land in this region may be resold.
         </text>
         <text hidden="true" name="can_not_resell">
@@ -72,4 +68,6 @@ for this Estate.
         <text hidden="true" name="can_not_change">
                 Purchased land in this region may not be joined or subdivided.
         </text>
+        <button bottom="-24" follows="left|top" font="SansSerifSmall" height="18"
+             label="?" right="470" name="covenant_help" width="18" />   
 </panel>