From 91cf878940fafe01c4f2f388fd72b434be9df8f5 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 12 Sep 2011 12:27:20 -0400
Subject: STORM-1579 xml formatting issues in Region/Estate floater Enlarged
 Covenant display area.  Widened Restart Region and Delay Restart to be the
 same size as the two buttons above them.

---
 indra/newview/skins/default/xui/en/panel_region_covenant.xml | 8 ++++----
 indra/newview/skins/default/xui/en/panel_region_debug.xml    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default')

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 2b2ea78fac..3ec6a1959a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -107,13 +107,13 @@
     <text_editor
      enabled="false"
      follows="left|top"
-     height="100"
+     height="110"
      layout="topleft"
-     left="110"
+     left="10"
      max_length="65535"
      name="covenant_editor"
-     top_delta="30"
-     width="340"
+     top_delta="20"
+     width="460"
      word_wrap="true">
         There is no Covenant provided for this Estate.
     </text_editor>
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 15df095efa..59710651e7 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -190,7 +190,7 @@
      name="restart_btn"
      tool_tip="Give 2 minute countdown and restart region"
      top_pad="5"
-     width="130" />
+     width="150" />
     <button
      follows="left|top"
      height="20"
@@ -200,5 +200,5 @@
      name="cancel_restart_btn"
      tool_tip="Delay region restart by one hour"
      top_pad="5"
-     width="130" />
+     width="150" />
 </panel>
-- 
cgit v1.2.3


From c841337d2b8fcf50df3f9626f9ecb188243ab43a Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 11 Oct 2011 06:11:38 -0400
Subject: STORM-1579 xml formatting issues in Region/Estate floater Changed
 covenant and debug panes per Oz's request. Covenant is taller; Restart
 buttons are moved to the right.

---
 .../skins/default/xui/en/panel_region_covenant.xml   |  2 +-
 .../skins/default/xui/en/panel_region_debug.xml      | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default')

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 3ec6a1959a..df16f6fd37 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -107,7 +107,7 @@
     <text_editor
      enabled="false"
      follows="left|top"
-     height="110"
+     height="180"
      layout="topleft"
      left="10"
      max_length="65535"
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 59710651e7..4550603134 100644
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -174,21 +174,21 @@
     <button
      follows="left|top"
      height="20"
-     label="Get Top Scripts..."
+     label="Restart Region"
      layout="topleft"
-     left="10"
-     name="top_scripts_btn"
-     tool_tip="List of objects spending the most time running scripts"
-     top_pad="5"
+     left_pad="155"
+     name="restart_btn"
+     tool_tip="Give 2 minute countdown and restart region"
+     top_delta="0"
      width="150" />
     <button
      follows="left|top"
      height="20"
-     label="Restart Region"
+     label="Get Top Scripts..."
      layout="topleft"
      left="10"
-     name="restart_btn"
-     tool_tip="Give 2 minute countdown and restart region"
+     name="top_scripts_btn"
+     tool_tip="List of objects spending the most time running scripts"
      top_pad="5"
      width="150" />
     <button
@@ -196,9 +196,9 @@
      height="20"
      label="Delay Restart"
      layout="topleft"
-     left="10"
+     left_pad="155"
      name="cancel_restart_btn"
      tool_tip="Delay region restart by one hour"
-     top_pad="5"
+     top_delta="0"
      width="150" />
 </panel>
-- 
cgit v1.2.3