Automated merge with ssh://hg.lindenlab.com/james/gooey/

2 files changed, 78 insertions, 87 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index e94717fe32..990be55847 100644
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
@@ -5,7 +5,7 @@
  border_style="line"
  can_resize="true"
  follows="left|top"
- height="570"
+ height="580"
  layout="topleft"
  min_height="271"
  min_width="290"
@@ -13,7 +13,7 @@
  help_topic="script_ed_float"
  save_rect="true"
  title="SCRIPT: NEW SCRIPT"
- width="500">
+ width="508">
     <floater.string
      name="not_allowed">
         You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
@@ -24,19 +24,31 @@
     </floater.string>
     <floater.string
      name="Title">
-        Script: [NAME]
+        SCRIPT: [NAME]
     </floater.string>
+    <panel
+     bevel_style="none"
+     
+     border_style="line"
+     follows="left|top|right|bottom"
+     height="522"
+     layout="topleft"
+     left="10"
+     name="script ed panel"
+     top="20"
+     width="497" />
     <button
-     follows="right|bottom"
-     height="20"
+     follows="left|bottom"
+     height="23"
      label="Reset"
      label_selected="Reset"
      layout="topleft"
-     left="358"
      name="Reset"
-     top="545"
-     width="128" />
+     left="10"
+     width="61" />
     <check_box
+    left_delta="71"
+    top_delta="3"
      enabled="false"
      follows="left|bottom"
      font="SansSerif"
@@ -44,30 +56,17 @@
      initial_value="true"
      label="Running"
      layout="topleft"
-     left_delta="-350"
      name="running"
-     top_delta="2"
      width="100" />
     <check_box
-     enabled="false"
+    left_delta="75"
+     enabled="true"
      follows="left|bottom"
      font="SansSerif"
      height="18"
      initial_value="true"
      label="Mono"
      layout="topleft"
-     left_delta="70"
      name="mono"
-     top_delta="0"
      width="100" />
-    <panel
-     bevel_style="none"
-     border_style="line"
-     follows="left|top|right|bottom"
-     height="506"
-     layout="topleft"
-     left="1"
-     name="script ed panel"
-     top="18"
-     width="497" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index 765e2ae623..d14355b9f4 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -2,13 +2,12 @@
 <panel
  bevel_style="none"
  border_style="line"
- bottom="550"
  follows="left|top|right|bottom"
- height="508"
+ height="522"
  layout="topleft"
  left="0"
  name="script panel"
- width="500">
+ width="497">
     <panel.string
      name="loading">
         Loading...
@@ -29,71 +28,17 @@
      name="Title">
         Script: [NAME]
     </panel.string>
-    <text_editor
-     type="string"
-     length="1"
-     bottom="393"
-     follows="left|top|right|bottom"
-     font="Monospace"
-     height="376"
-     ignore_tab="false"
-     layout="topleft"
-     left="4"
-     max_length="65536"
-     name="Script Editor"
-     width="492"
-     show_line_numbers="true" 
-     handle_edit_keys_directly="true" 
-     word_wrap="true">
-        Loading...
-    </text_editor>
-    <button
-     bottom="499"
-     follows="right|bottom"
-     height="20"
-     label="Save"
-     label_selected="Save"
-     layout="topleft"
-     left="360"
-     name="Save_btn"
-     width="128" />
-    <scroll_list
-     bottom="457"
-     follows="left|right|bottom"
-     height="60"
-     layout="topleft"
-     left="4"
-     name="lsl errors"
-     width="492" />
-    <combo_box
-     bottom="499"
-     follows="left|bottom"
-     height="20"
-     label="Insert..."
-     layout="topleft"
-     left="12"
-     name="Insert..."
-     width="128" />
-    <text
-     bottom="473"
-     follows="left|bottom"
-     height="12"
-     layout="topleft"
-     left="12"
-     name="line_col"
-     width="128" />
     <menu_bar
      bg_visible="false"
-     bottom="18"
-     follows="left|top|right"
+     follows="left|top"
      height="18"
      layout="topleft"
-     left="8"
+     left="0"
      mouse_opaque="false"
      name="script_menu"
      width="476">
         <menu
-         bottom="18"
+         top="0"
          height="62"
          label="File"
          layout="topleft"
@@ -113,11 +58,10 @@
              name="Revert All Changes" />
         </menu>
         <menu
-         bottom="-647"
+         top="0"
          height="198"
          label="Edit"
          layout="topleft"
-         left="222"
          mouse_opaque="false"
          name="Edit"
          width="139">
@@ -169,11 +113,10 @@
              name="Search / Replace..." />
         </menu>
         <menu
-         bottom="18"
+         top="0"
          height="34"
          label="Help"
          layout="topleft"
-         left="0"
          mouse_opaque="false"
          name="Help"
          width="112">
@@ -187,4 +130,53 @@
              name="Keyword Help..." />
         </menu>
     </menu_bar>
+    <text_editor
+    left="0"
+     type="string"
+     length="1"
+     follows="left|top|right|bottom"
+     font="Monospace"
+     height="376"
+     ignore_tab="false"
+     layout="topleft"
+     max_length="65536"
+     name="Script Editor"
+     width="487"
+     show_line_numbers="true" 
+     handle_edit_keys_directly="true" 
+     word_wrap="true">
+        Loading...
+    </text_editor>
+    <scroll_list
+    top_pad="10"
+    left="0"
+     follows="left|right|bottom"
+     height="60"
+     layout="topleft"
+     name="lsl errors"
+     width="487" />
+    <text
+     follows="left|bottom"
+     height="12"
+     layout="topleft"
+     left="0"
+     name="line_col"
+     width="128" />
+    <combo_box
+     follows="left|bottom"
+     height="23"
+     label="Insert..."
+     layout="topleft"
+     name="Insert..."
+     width="128" />
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Save"
+     label_selected="Save"
+     layout="topleft"
+     top_pad="-35"
+     right="487"
+     name="Save_btn"
+     width="61" />
 </panel>