merge changes for storm-1579

doc/contributions.txt

@@ -576,6 +576,7 @@ Jonathan Yap
 	STORM-1567
 	STORM-1572
 	STORM-1574
+	STORM-1579
 Kadah Coba
     STORM-1060
 Jondan Lundquist

indra/newview/skins/default/xui/en/panel_region_covenant.xml

@@ -107,13 +107,13 @@
     <text_editor
      enabled="false"
      follows="left|top"
-     height="100"
+     height="180"
      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>

indra/newview/skins/default/xui/en/panel_region_debug.xml

@@ -171,6 +171,16 @@
      tool_tip="List of objects experiencing the most potential collisions"
      top="313"
      width="150" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Restart Region"
+     layout="topleft"
+     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"
@@ -181,24 +191,14 @@
      tool_tip="List of objects spending the most time running scripts"
      top_pad="5"
      width="150" />
-    <button
-     follows="left|top"
-     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="130" />
     <button
      follows="left|top"
      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"
-     width="130" />
+     top_delta="0"
+     width="150" />
 </panel>