From fbb4e5fb0f7bba935ec9d0d466be12a346a6b149 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 8 Jun 2012 13:49:02 -0400
Subject: STORM-68 As a Builder, I want that ability to set default permissions
 on creation of objects, clothing, scripts, notecards, etc. First pass at
 implementation, debuggins lines still need to be removed and there is one
 known bug to be resolved.

---
 .../skins/default/xui/en/floater_perms_default.xml | 508 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   7 -
 .../default/xui/en/panel_preferences_advanced.xml  |  11 +
 3 files changed, 519 insertions(+), 7 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_perms_default.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
new file mode 100644
index 0000000000..ac19be8d15
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -0,0 +1,508 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="250"
+ layout="topleft"
+ name="perms default"
+ help_topic="perms_default"
+ save_rect="true"
+ title="DEFAULT CREATION PERMISSIONS"
+ width="700">
+
+  <panel
+   follows="left|top|right|bottom"
+   height="200"
+   label="Default Permissions"
+   layout="topleft"
+   left="10"
+   name="default permissions"
+   top="20"
+   width="690">
+
+     <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="16"
+      halign="center"
+      layout="topleft"
+      left="120"
+      top="10"
+      width="100">
+         Copy
+      </text>
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       halign="center"
+       layout="topleft"
+       left_pad="5"
+       top="10"
+       width="100">
+          Modify
+      </text>
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       halign="center"
+       layout="topleft"
+       left_pad="5"
+       top="10"
+       width="100">
+          Transfer
+      </text>
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="32"
+       halign="center"
+       layout="topleft"
+       left_pad="5"
+       top="10"
+       word_wrap="true"
+       width="100">
+          Share with group
+      </text>
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="32"
+       halign="center"
+       layout="topleft"
+       left_pad="5"
+       top="10"
+       word_wrap="true"
+       width="120">
+          Allow anyone to copy
+      </text>
+
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       layout="topleft"
+       left="0"
+       top_pad="10"
+       tool_tip="Set default permissions for when Objects are created"
+       width="100">
+          Objects
+      </text>
+      <icon
+       follows="left|top"
+       height="16"
+       image_name="Inv_Object"
+       layout="topleft"
+       left_pad="2"
+       width="18"/>
+
+      <check_box
+       control_name="ObjectsNextOwnerCopy"
+       height="16"
+       layout="topleft"
+       name="objects_c"
+       left_pad="45"
+       top_delta="0"
+       width="100">
+        <check_box.commit_callback
+         function="PermsDefault.Copy"
+         parameter="Objects" />
+      </check_box>
+      <check_box
+       control_name="ObjectsNextOwnerModify"
+       height="16"
+       layout="topleft"
+       name="objects_m"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       enabled_control="ObjectsNextOwnerCopy"
+       control_name="ObjectsNextOwnerTransfer"
+       height="16"
+       layout="topleft"
+       name="Objects_transfer"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       control_name="ObjectsShareWithGroup"
+       height="16"
+       layout="topleft"
+       name="objects_s"
+       left_pad="0"
+       top_delta="0"
+       width="120" />
+      <check_box
+       control_name="ObjectsEveryoneCopy"
+       height="16"
+       layout="topleft"
+       name="objects_a"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       layout="topleft"
+       left="0"
+       tool_tip="Set default permissions for uploaded items"
+       width="100">
+          Uploads
+      </text>
+      <icon
+       follows="left|top"
+       height="16"
+       image_name="Inv_Texture"
+       layout="topleft"
+       left_pad="2"
+       width="18"/>
+
+      <check_box
+       control_name="UploadsNextOwnerCopy"
+       height="16"
+       layout="topleft"
+       name="uploads_c"
+       left_pad="45"
+       top_delta="0"
+       width="100">
+        <check_box.commit_callback
+         function="PermsDefault.Copy"
+         parameter="Uploads" />
+      </check_box>
+      <check_box
+       control_name="UploadsNextOwnerModify"
+       height="16"
+       layout="topleft"
+       name="uploads_m"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       enabled_control="UploadsNextOwnerCopy"
+       control_name="UploadsNextOwnerTransfer"
+       height="16"
+       layout="topleft"
+       name="Uploads_transfer"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       control_name="UploadsShareWithGroup"
+       height="16"
+       layout="topleft"
+       name="uploads_s"
+       left_pad="0"
+       top_delta="0"
+       width="120" />
+      <check_box
+       control_name="UploadsEveryoneCopy"
+       height="16"
+       layout="topleft"
+       name="uploads_a"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       layout="topleft"
+       left="0"
+       tool_tip="Set default permissions for when Scripts are created"
+       width="100">
+          Scripts
+      </text>
+      <icon
+       follows="left|top"
+       height="16"
+       image_name="Inv_Script"
+       layout="topleft"
+       left_pad="2"
+       width="18"/>
+
+      <check_box
+       control_name="ScriptsNextOwnerCopy"
+       height="16"
+       layout="topleft"
+       name="scripts_c"
+       left_pad="45"
+       top_delta="0"
+       width="100">
+        <check_box.commit_callback
+         function="PermsDefault.Copy"
+         parameter="Scripts" />
+      </check_box>
+      <check_box
+       control_name="ScriptsNextOwnerModify"
+       height="16"
+       layout="topleft"
+       name="scripts_m"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       enabled_control="ScriptsNextOwnerCopy"
+       control_name="ScriptsNextOwnerTransfer"
+       height="16"
+       layout="topleft"
+       name="Scripts_transfer"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       control_name="ScriptsShareWithGroup"
+       height="16"
+       layout="topleft"
+       name="scripts_s"
+       left_pad="0"
+       top_delta="0"
+       width="120" />
+      <check_box
+       control_name="ScriptsEveryoneCopy"
+       height="16"
+       layout="topleft"
+       name="scripts_a"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       layout="topleft"
+       left="0"
+       tool_tip="Set default permissions for when Notecards are created"
+       width="100">
+        Notecards
+      </text>
+      <icon
+       follows="left|top"
+       height="16"
+       image_name="Inv_Notecard"
+       layout="topleft"
+       left_pad="2"
+       width="18"/>
+
+      <check_box
+       control_name="NotecardsNextOwnerCopy"
+       height="16"
+       layout="topleft"
+       name="notecards_c"
+       left_pad="45"
+       top_delta="0"
+       width="100">
+        <check_box.commit_callback
+         function="PermsDefault.Copy"
+         parameter="Notecards" />
+      </check_box>
+      <check_box
+       control_name="NotecardsNextOwnerModify"
+       height="16"
+       layout="topleft"
+       name="notecards_m"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       enabled_control="NotecardsNextOwnerCopy"
+       control_name="NotecardsNextOwnerTransfer"
+       height="16"
+       layout="topleft"
+       name="Notecards_transfer"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       control_name="NotecardsShareWithGroup"
+       height="16"
+       layout="topleft"
+       name="notecards_s"
+       left_pad="0"
+       top_delta="0"
+       width="120" />
+      <check_box
+       control_name="NotecardsEveryoneCopy"
+       height="16"
+       layout="topleft"
+       name="notecards_a"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       layout="topleft"
+       left="0"
+       tool_tip="Set default permissions for when Gestures are created"
+       width="100">
+          Gestures
+      </text>
+      <icon
+       follows="left|top"
+       height="16"
+       image_name="Inv_Gesture"
+       layout="topleft"
+       left_pad="2"
+       width="18"/>
+
+      <check_box
+       control_name="GesturesNextOwnerCopy"
+       height="16"
+       layout="topleft"
+       name="gestures_c"
+       left_pad="45"
+       top_delta="0"
+       width="100">
+        <check_box.commit_callback
+         function="PermsDefault.Copy"
+         parameter="Gestures" />
+      </check_box>
+      <check_box
+       control_name="GesturesNextOwnerModify"
+       height="16"
+       layout="topleft"
+       name="gestures_m"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       enabled_control="GesturesNextOwnerCopy"
+       control_name="GesturesNextOwnerTransfer"
+       height="16"
+       layout="topleft"
+       name="Gestures_transfer"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       control_name="GesturesShareWithGroup"
+       height="16"
+       layout="topleft"
+       name="gestures_s"
+       left_pad="0"
+       top_delta="0"
+       width="120" />
+      <check_box
+       control_name="GesturesEveryoneCopy"
+       height="16"
+       layout="topleft"
+       name="gestures_a"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+
+
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       layout="topleft"
+       left="0"
+       tool_tip="Set default permissions for when Clothing or Body Parts are created"
+       width="100">
+          Wearables
+      </text>
+      <icon
+       follows="left|top"
+       height="16"
+       image_name="Inv_BodyShape"
+       layout="topleft"
+       left_pad="2"
+       width="18"/>
+
+      <check_box
+       control_name="WearablesNextOwnerCopy"
+       height="16"
+       layout="topleft"
+       name="wearables_c"
+       left_pad="45"
+       top_delta="0"
+       width="100">
+        <check_box.commit_callback
+         function="PermsDefault.Copy"
+         parameter="Wearables" />
+      </check_box>
+      <check_box
+       control_name="WearablesNextOwnerModify"
+       height="16"
+       layout="topleft"
+       name="wearables_m"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       enabled_control="WearablesNextOwnerCopy"
+       control_name="WearablesNextOwnerTransfer"
+       height="16"
+       layout="topleft"
+       name="Wearables_transfer"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+      <check_box
+       control_name="WearablesShareWithGroup"
+       height="16"
+       layout="topleft"
+       name="wearables_s"
+       left_pad="0"
+       top_delta="0"
+       width="120" />
+      <check_box
+       control_name="WearablesEveryoneCopy"
+       height="16"
+       layout="topleft"
+       name="wearables_a"
+       left_pad="0"
+       top_delta="0"
+       width="100" />
+
+  </panel>
+
+  <button
+   height="20"
+   label="OK"
+   label_selected="OK"
+   layout="topleft"
+   name="ok"
+   left="480"
+   width="100">
+	<button.commit_callback
+	 function="PermsDefault.OK" />
+  </button>
+
+  <button
+   height="20"
+   label="Cancel"
+   label_selected="Cancel"
+   layout="topleft"
+   left_pad="5"
+   name="cancel"
+   top_delta="0"
+   width="100">
+    <button.commit_callback
+     function="PermsDefault.Cancel" />
+  </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5ba566b175..c660ef13ae 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1131,13 +1131,6 @@
                  function="File.UploadBulk"
                  parameter="" />
             </menu_item_call>
-            <menu_item_call
-             label="Set Default Upload Permissions"
-             name="perm prefs">
-                <menu_item_call.on_click
-                 function="Floater.Toggle"
-                 parameter="perm_prefs" />
-            </menu_item_call>
         </menu>
         <menu_item_separator/>
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 2cc9d9c1b0..b6985f911e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -222,4 +222,15 @@
      name="show_develop_menu_check"
      top_pad="5"
      width="237"/>
+    <button
+     height="20"
+     label="Default Creation Permissions"
+     layout="topleft"
+     name="Default Creation Permissions"
+     left="30"
+     top_pad = "20"
+     width="250">
+	<button.commit_callback
+	 function="Pref.PermsDefault" />
+  </button>
 </panel>
-- 
cgit v1.2.3


From 052dc3982056d822a523394954c277d9eb7c7ab9 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 12 Jun 2012 14:26:53 -0400
Subject: STORM-68 Fix for group perms not being defined correctly and fix for
 group and everyone perms failing to copy and paste

---
 .../skins/default/xui/en/floater_perm_prefs.xml    | 108 ---------------------
 .../skins/default/xui/en/floater_perms_default.xml |  23 -----
 2 files changed, 131 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_perm_prefs.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
deleted file mode 100644
index ff454e3ebf..0000000000
--- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- height="180"
- layout="topleft"
- name="perm prefs"
- help_topic="perm_prefs"
- save_rect="true"
- title="DEFAULT UPLOAD PERMISSIONS"
- width="315">
-    <panel
-     follows="left|top|right|bottom"
-     height="120"
-     label="Permissions"
-     layout="topleft"
-     left="10"
-     name="permissions"
-     top="20"
-     width="315">
-        <check_box
-         control_name="ShareWithGroup"
-         height="16"
-         label="Share with group"
-         layout="topleft"
-         left="10"
-         name="share_with_group"
-         top="5"
-         width="150" />
-        <check_box
-         control_name="EveryoneCopy"
-         height="16"
-         label="Allow anyone to copy"
-         layout="topleft"
-         left_delta="0"
-         name="everyone_copy"
-         top_pad="5"
-         width="150" />
-        <text
-         type="string"
-         length="1"
-         follows="left|top"
-         height="10"
-         layout="topleft"
-         left_delta="0"
-         name="NextOwnerLabel"
-         top_pad="5"
-         width="200">
-            Next owner can:
-        </text>
-        <check_box
-         control_name="NextOwnerModify"
-         height="16"
-         label="Modify"
-         layout="topleft"
-         left_delta="0"
-         name="next_owner_modify"
-         top_pad="5"
-         width="150" />
-        <check_box
-         control_name="NextOwnerCopy"
-         height="16"
-         label="Copy"
-         layout="topleft"
-         left_delta="0"
-         name="next_owner_copy"
-         top_pad="5"
-         width="150" >
-		    <check_box.commit_callback
-			function="Perms.Copy" />
-		</check_box>
-        <check_box
-		 enabled_control="NextOwnerCopy"
-         control_name="NextOwnerTransfer"
-         enabled="false"
-         height="16"
-         initial_value="true"
-         label="Resell/Give away"
-         layout="topleft"
-         left_delta="0"
-         name="next_owner_transfer"
-         top_pad="5"
-         width="150" />
-    </panel>
-    <button
-     height="20"
-     label="OK"
-     label_selected="OK"
-     layout="topleft"
-     left="90"
-     name="ok"
-     top="150"
-     width="100">
-		<button.commit_callback
-		function="Perms.OK" />
-	</button>
-    <button
-     height="20"
-     label="Cancel"
-     label_selected="Cancel"
-     layout="topleft"
-     left_pad="5"
-     name="cancel"
-     top_delta="0"
-     width="100">
-		<button.commit_callback
-		function="Perms.Cancel" />
-	</button>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index ac19be8d15..15077330fd 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -8,7 +8,6 @@
  save_rect="true"
  title="DEFAULT CREATION PERMISSIONS"
  width="700">
-
   <panel
    follows="left|top|right|bottom"
    height="200"
@@ -18,7 +17,6 @@
    name="default permissions"
    top="20"
    width="690">
-
      <text
       type="string"
       length="1"
@@ -31,7 +29,6 @@
       width="100">
          Copy
       </text>
-
       <text
        type="string"
        length="1"
@@ -44,7 +41,6 @@
        width="100">
           Modify
       </text>
-
       <text
        type="string"
        length="1"
@@ -57,7 +53,6 @@
        width="100">
           Transfer
       </text>
-
       <text
        type="string"
        length="1"
@@ -71,7 +66,6 @@
        width="100">
           Share with group
       </text>
-
       <text
        type="string"
        length="1"
@@ -85,8 +79,6 @@
        width="120">
           Allow anyone to copy
       </text>
-
-
       <text
        type="string"
        length="1"
@@ -106,7 +98,6 @@
        layout="topleft"
        left_pad="2"
        width="18"/>
-
       <check_box
        control_name="ObjectsNextOwnerCopy"
        height="16"
@@ -152,7 +143,6 @@
        left_pad="0"
        top_delta="0"
        width="100" />
-
       <text
        type="string"
        length="1"
@@ -171,7 +161,6 @@
        layout="topleft"
        left_pad="2"
        width="18"/>
-
       <check_box
        control_name="UploadsNextOwnerCopy"
        height="16"
@@ -217,7 +206,6 @@
        left_pad="0"
        top_delta="0"
        width="100" />
-
       <text
        type="string"
        length="1"
@@ -236,7 +224,6 @@
        layout="topleft"
        left_pad="2"
        width="18"/>
-
       <check_box
        control_name="ScriptsNextOwnerCopy"
        height="16"
@@ -282,7 +269,6 @@
        left_pad="0"
        top_delta="0"
        width="100" />
-
       <text
        type="string"
        length="1"
@@ -301,7 +287,6 @@
        layout="topleft"
        left_pad="2"
        width="18"/>
-
       <check_box
        control_name="NotecardsNextOwnerCopy"
        height="16"
@@ -347,7 +332,6 @@
        left_pad="0"
        top_delta="0"
        width="100" />
-
       <text
        type="string"
        length="1"
@@ -366,7 +350,6 @@
        layout="topleft"
        left_pad="2"
        width="18"/>
-
       <check_box
        control_name="GesturesNextOwnerCopy"
        height="16"
@@ -412,8 +395,6 @@
        left_pad="0"
        top_delta="0"
        width="100" />
-
-
       <text
        type="string"
        length="1"
@@ -432,7 +413,6 @@
        layout="topleft"
        left_pad="2"
        width="18"/>
-
       <check_box
        control_name="WearablesNextOwnerCopy"
        height="16"
@@ -478,9 +458,7 @@
        left_pad="0"
        top_delta="0"
        width="100" />
-
   </panel>
-
   <button
    height="20"
    label="OK"
@@ -492,7 +470,6 @@
 	<button.commit_callback
 	 function="PermsDefault.OK" />
   </button>
-
   <button
    height="20"
    label="Cancel"
-- 
cgit v1.2.3


From be65c429be67a85d66f9b5db61d70f6268640acc Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 20 Jan 2013 11:45:41 -0500
Subject: STORM-68 Minor UI improvement

---
 .../skins/default/xui/en/floater_perms_default.xml | 30 ++++++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index 15077330fd..9c3b92bc83 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -17,17 +17,37 @@
    name="default permissions"
    top="20"
    width="690">
+
+      <view_border
+       bevel_style="none"
+       height="18"
+       top="8"
+       left="0"
+       width="430" /> 
+
      <text
       type="string"
       length="1"
       follows="left|top"
       height="16"
-      halign="center"
+      halign="right"
       layout="topleft"
-      left="120"
+      left="0"
       top="10"
-      width="100">
-         Copy
+      width="115">
+         Next owner:
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       halign="center"
+       layout="topleft"
+       left_pad="5"
+       top="10"
+       width="100">
+          Copy
       </text>
       <text
        type="string"
@@ -52,7 +72,7 @@
        top="10"
        width="100">
           Transfer
-      </text>
+      </text>    
       <text
        type="string"
        length="1"
-- 
cgit v1.2.3


From c817166ebe67cefd02f8c9e3bb9195a6a86fa199 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 23 Jan 2013 14:17:48 -0500
Subject: STORM-68  STORM-68 Remove obsolete menu entry for default uploads.
 Remove two matching entries in settings.xml (the other three were already
 eliminated). Adjust default permissions for new notecards and gestures to
 C/M/T (the current default).

---
 indra/newview/skins/default/xui/en/menu_inventory_add.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index e91f5af3d5..8bc4df6c79 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -63,13 +63,6 @@
                      function="File.UploadBulk"
                      parameter="" />
                 </menu_item_call>
-	            <menu_item_call
-	             label="Set Default Upload Permissions"
-	             name="perm prefs">
-	                <menu_item_call.on_click
-	                 function="Floater.Toggle"
-	                 parameter="perm_prefs" />
-	            </menu_item_call>
             </menu>
 
             <menu_item_call
-- 
cgit v1.2.3


From 7d5ed4f7477c2c564f0e9dededf7131ed42d55b8 Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Thu, 27 Jun 2013 21:28:52 +0100
Subject: Moving LSL highlighting colour info into .../skins/default/colors.xml
 where it makes more sense than its own xml file. Changing other functions to
 read it.

---
 indra/newview/skins/default/colors.xml | 53 ++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index a9176595c7..fe794c18c5 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -884,4 +884,57 @@
   <color
     name="blue"
     value="0 0 1 1"/>
+
+  <!-- syntax highlighting (LSL Scripts) -->
+  <color
+    name="SyntaxLslComment1Sided"
+    value=".8 .3 .15 1.0" />
+  <color
+    name="SyntaxLslComment2Sided"
+    value=".8 .3 .15 1.0" />
+  <color
+    name="SyntaxLslConstantFloat"
+    value=".3 .1 .5 1.0" />
+  <color
+    name="SyntaxLslConstantInteger"
+    value=".1 .1 .5 1.0" />
+  <color
+    name="SyntaxLslConstantKey"
+    value=".1 .3 .5 1.0" />
+  <color
+    name="SyntaxLslConstantRotation"
+    value=".2 .4 .2 1.0" />
+  <color
+    name="SyntaxLslConstantString"
+    value=".1 .3 .5 1.0" />
+  <color
+    name="SyntaxLslConstantVector"
+    value=".2 .4 .2 1.0" />
+  <color
+    name="SyntaxLslControlFlow"
+    value="0 0 .8 1.0" />
+  <color
+    name="SyntaxLslControlLabel"
+    value="0 0 .8 1.0" />
+  <color
+    name="SyntaxLslDataType"
+    value=".1 .3 .1 1.0" />
+  <color
+    name="SyntaxLslDeprecated"
+    value=".9 .4 .55 1.0" />
+  <color
+   name="SyntaxLslEvent"
+   value="0 .3 .5 1.0" />
+  <color
+   name="SyntaxLslFunction"
+   value=".3 0 .5 1.0" />
+  <color
+   name="SyntaxLslGodMode"
+   value="0.7 .2 .35 1.0" />
+  <color
+    name="SyntaxLslSection"
+    value=".5 .1 .3 1.0" />
+  <color
+    name="SyntaxLslStringLiteral"
+    value="0 .2 0 1.0" />
 </colors>
-- 
cgit v1.2.3


From ee238ce3f1f100942032a290a5c9b7429d14938f Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Fri, 11 Oct 2013 18:12:42 -0400
Subject: STORM-1972 Restore missing particle info display menu item

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2d65052def..2ccefc8724 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2553,6 +2553,16 @@
            function="Advanced.ToggleInfoDisplay"
            parameter="lights" />
         </menu_item_check>
+        <menu_item_check
+         label="Particles"
+         name="Particles">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="particles" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="particles" />
+        </menu_item_check>
         <menu_item_check
          label="Collision Skeleton"
          name="Collision Skeleton">
-- 
cgit v1.2.3


From 92f1f7a525c3a550575050ca00b10924fdf4dce1 Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Fri, 18 Oct 2013 17:37:40 +0100
Subject: storm-1831 Fixing colors xml broken by me during last merge :-(

---
 indra/newview/skins/default/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index d01e228638..105d4be7d8 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -915,7 +915,7 @@
   <color
     name="ResizebarBody"
     value="0.208 0.208 0.208 1"/>
-    
+ <color
     name="SyntaxLslConstantKey"
     value=".1 .3 .5 1.0" />
   <color
-- 
cgit v1.2.3


From 389e302f85bc21526a577ca4d3259b378a6402cc Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Mon, 21 Oct 2013 19:13:08 +0100
Subject: Fixing typo in colors.xml pointed out by Kireji2 Haiku

---
 indra/newview/skins/default/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 105d4be7d8..77a8fc7e22 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -56,7 +56,7 @@
 	<color
 	 name="Black"
 	 value="0 0 0 1" />
-	<colork
+	<color
 	 name="Black_10"
 	 value="0 0 0 0.1" />
 	<color
-- 
cgit v1.2.3


From 5301bd38deee7e2c443b4cfba19f9c595747c20a Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Thu, 7 Nov 2013 00:23:24 +0000
Subject: STORM-1831 Increasing source text buffer to 256 KB (As discussed in
 Server/Scripting and Open Source User Groups).

This change also addresses/closes: VWR-22401
---
 indra/newview/skins/default/xui/en/panel_script_ed.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

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 bcdef96138..d1b35dce9d 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -157,7 +157,7 @@
      height="376"
      ignore_tab="false"
      layout="topleft"
-     max_length="65536"
+     max_length="262144"
      name="Script Editor"
      text_readonly_color="DkGray"
      width="487"
-- 
cgit v1.2.3


From e988fffbca2199156ed656a091409394246f929d Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 7 Nov 2013 16:27:38 -0500
Subject: STORM-68 Add initial support to use a capability for setting default
 object permissions on the server.

---
 indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index afc5b916e7..a46cce996b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7722,5 +7722,16 @@ Disabling future updates for this file.
 Attempted to add an invalid or unreadable image file [FNAME] which could not be opened or decoded.
 Attempt cancelled.
   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DefaultObjectPermissions"
+   type="alert">
+	There was a problem saving the default permissions due to the following reason: [REASON].  Please try setting the default permissions later.
+	<tag>fail</tag>
+   <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3


From 2d701456a07d37a520f436f9e83b1008e492f232 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 12 Dec 2013 08:51:15 -0500
Subject: STORM-68 Fix bug for new gestures, notecards, and scripts where a
 copied item did not preserve its default permissions. Add apply button.

---
 .../skins/default/xui/en/floater_perms_default.xml | 40 ++++++++++++++--------
 1 file changed, 25 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index 9c3b92bc83..4e44c9ebb3 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -17,24 +17,22 @@
    name="default permissions"
    top="20"
    width="690">
-
       <view_border
        bevel_style="none"
        height="18"
        top="8"
        left="0"
        width="430" /> 
-
-     <text
-      type="string"
-      length="1"
-      follows="left|top"
-      height="16"
-      halign="right"
-      layout="topleft"
-      left="0"
-      top="10"
-      width="115">
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="16"
+       halign="right"
+       layout="topleft"
+       left="0"
+       top="10"
+       width="115">
          Next owner:
       </text>
       <text
@@ -479,16 +477,28 @@
        top_delta="0"
        width="100" />
   </panel>
+  <button
+   height="20"
+   label="Apply"
+   label_selected="Apply"
+   layout="topleft"
+   name="apply"
+   left="375"
+   width="100">
+	<button.commit_callback
+	 function="PermsDefault.Apply" />
+  </button>
   <button
    height="20"
    label="OK"
    label_selected="OK"
    layout="topleft"
+   left_pad="5"
    name="ok"
-   left="480"
+   top_delta="0"
    width="100">
-	<button.commit_callback
-	 function="PermsDefault.OK" />
+    <button.commit_callback
+     function="PermsDefault.OK" />
   </button>
   <button
    height="20"
-- 
cgit v1.2.3


From c804c6b69e9de586225b9cc84c6e6adafba83f8f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 12 Dec 2013 14:11:28 -0500
Subject: STORM-68 Remove Apply button Add menu entry to Build->Options->Set
 Default Permissions... Disable Preferences->Advanced->Default Creation
 Permissions button when on login screen Add code for a one-time conversion
 from the old upload settings XML cleanup

---
 .../skins/default/xui/en/floater_perms_default.xml | 40 ++++++++--------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  7 ++++
 .../default/xui/en/panel_preferences_advanced.xml  |  2 +-
 3 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_perms_default.xml b/indra/newview/skins/default/xui/en/floater_perms_default.xml
index 4e44c9ebb3..ceb260fffb 100644
--- a/indra/newview/skins/default/xui/en/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/en/floater_perms_default.xml
@@ -141,7 +141,7 @@
        control_name="ObjectsNextOwnerTransfer"
        height="16"
        layout="topleft"
-       name="Objects_transfer"
+       name="objects_t"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -157,7 +157,7 @@
        control_name="ObjectsEveryoneCopy"
        height="16"
        layout="topleft"
-       name="objects_a"
+       name="objects_e"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -204,7 +204,7 @@
        control_name="UploadsNextOwnerTransfer"
        height="16"
        layout="topleft"
-       name="Uploads_transfer"
+       name="uploads_t"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -220,7 +220,7 @@
        control_name="UploadsEveryoneCopy"
        height="16"
        layout="topleft"
-       name="uploads_a"
+       name="uploads_e"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -267,7 +267,7 @@
        control_name="ScriptsNextOwnerTransfer"
        height="16"
        layout="topleft"
-       name="Scripts_transfer"
+       name="scripts_t"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -283,7 +283,7 @@
        control_name="ScriptsEveryoneCopy"
        height="16"
        layout="topleft"
-       name="scripts_a"
+       name="scripts_e"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -330,7 +330,7 @@
        control_name="NotecardsNextOwnerTransfer"
        height="16"
        layout="topleft"
-       name="Notecards_transfer"
+       name="notecards_t"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -346,7 +346,7 @@
        control_name="NotecardsEveryoneCopy"
        height="16"
        layout="topleft"
-       name="notecards_a"
+       name="notecards_e"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -393,7 +393,7 @@
        control_name="GesturesNextOwnerTransfer"
        height="16"
        layout="topleft"
-       name="Gestures_transfer"
+       name="gestures_t"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -456,7 +456,7 @@
        control_name="WearablesNextOwnerTransfer"
        height="16"
        layout="topleft"
-       name="Wearables_transfer"
+       name="wearables_t"
        left_pad="0"
        top_delta="0"
        width="100" />
@@ -472,33 +472,21 @@
        control_name="WearablesEveryoneCopy"
        height="16"
        layout="topleft"
-       name="wearables_a"
+       name="wearables_e"
        left_pad="0"
        top_delta="0"
        width="100" />
   </panel>
-  <button
-   height="20"
-   label="Apply"
-   label_selected="Apply"
-   layout="topleft"
-   name="apply"
-   left="375"
-   width="100">
-	<button.commit_callback
-	 function="PermsDefault.Apply" />
-  </button>
   <button
    height="20"
    label="OK"
    label_selected="OK"
    layout="topleft"
-   left_pad="5"
    name="ok"
-   top_delta="0"
+   left="475"
    width="100">
-    <button.commit_callback
-     function="PermsDefault.OK" />
+	<button.commit_callback
+	 function="PermsDefault.OK" />
   </button>
   <button
    height="20"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 554c7c95e4..3c04f07b12 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1077,6 +1077,13 @@
          label="Options"
          name="Options"
          tear_off="true">
+        <menu_item_call
+         label="Set Default Permissions..."
+         name="Set default permissions">
+          <menu_item_call.on_click
+           function="Floater.ToggleOrBringToFront"
+           parameter="perms_default" />
+        </menu_item_call>
 	   <menu_item_check
 	       label="Show Advanced Permissions"
 	       name="DebugPermissions">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 335f1614d8..2e778014c5 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -226,7 +226,7 @@
      height="20"
      label="Default Creation Permissions"
      layout="topleft"
-     name="Default Creation Permissions"
+     name="default_creation_permissions"
      left="30"
      top_pad = "20"
      width="250">
-- 
cgit v1.2.3


From 8df2007187236d1b77ccec916fc63f0481cf599c Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Tue, 14 Jan 2014 03:45:14 +0000
Subject: storm-1831 Enabling highlighting of deprecated and god-mode
 functions.

---
 indra/newview/skins/default/colors.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 77a8fc7e22..dab4c5eb3b 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -936,9 +936,9 @@
   <color
     name="SyntaxLslDataType"
     value=".1 .3 .1 1.0" />
-  <color
+   <color
     name="SyntaxLslDeprecated"
-    value=".9 .4 .55 1.0" />
+    value="0.9 0.0 0.66, 1.0" />
   <color
    name="SyntaxLslEvent"
    value="0 .3 .5 1.0" />
-- 
cgit v1.2.3


From ebac8c0a2a0fe8487892e3f2043bc7786c0dc3c9 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 14 Jan 2014 10:34:08 -0500
Subject: STORM-2007 Buy floater displays truncated names/permissions when
 object is set to sell original and sell copy.

---
 indra/newview/skins/default/xui/en/floater_buy_object.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 5fdd4aa49d..49be4290c7 100755
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -47,7 +47,7 @@
          width="16" />
         <scroll_list.columns
          name="text"
-         width="234" />
+         relative_width="1" />
     </scroll_list>
     <text
      type="string"
@@ -77,7 +77,7 @@
          width="16" />
         <scroll_list.columns
          name="text"
-         width="234" />
+         relative_width="1" />
     </scroll_list>
     <text
      type="string"
-- 
cgit v1.2.3


From 840e1da8aa4b019ebf08c8c36c72ac01ad592506 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 3 Mar 2014 14:08:26 -0500
Subject: STORM-2017 Untranslatable text appears when scaling, or moving
 objects

---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7e79d297ef..0efe9ad80a 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -383,6 +383,8 @@ Please try logging in again in a minute.</string>
 	<string name="multiple_textures">Multiple</string>
 
 <string name="use_texture">Use texture</string>
+    <string name="manip_hint1">Move mouse cursor over ruler</string>
+    <string name="manip_hint2">to snap to grid</string>
 
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
-- 
cgit v1.2.3


From c8b0484034d69aa38afba14e6965f69cf8c8da24 Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Thu, 6 Mar 2014 14:04:05 +0000
Subject: Removing duplicate entry from colors.xml

---
 indra/newview/skins/default/colors.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index dfd7b5ee39..cb1d6aa32b 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -919,9 +919,6 @@
     name="SyntaxLslConstantInteger"
     value=".1 .1 .5 1.0" />
   <color
-    name="ResizebarBody"
-    value="0.208 0.208 0.208 1"/>
- <color
     name="SyntaxLslConstantKey"
     value=".1 .3 .5 1.0" />
   <color
-- 
cgit v1.2.3


From 672cc7049777b57a01a61428864ac6e3d10df321 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 6 Mar 2014 09:18:20 -0500
Subject: STORM-68 Adjusted Build->Options menu

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ff022c7d3a..2058e671e5 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1077,13 +1077,6 @@
          label="Options"
          name="Options"
          tear_off="true">
-        <menu_item_call
-         label="Set Default Permissions..."
-         name="Set default permissions">
-          <menu_item_call.on_click
-           function="Floater.ToggleOrBringToFront"
-           parameter="perms_default" />
-        </menu_item_call>
 	   <menu_item_check
 	       label="Show Advanced Permissions"
 	       name="DebugPermissions">
@@ -1194,8 +1187,9 @@
                     <menu_item_call.on_enable
                      function="SomethingSelected" />
                 </menu_item_call>
+                <menu_item_separator/>
                 <menu_item_call
-                 label="Grid Options"
+                 label="Grid Options..."
                  name="Grid Options"
                  shortcut="control|shift|B">
                     <menu_item_call.on_click
@@ -1204,6 +1198,13 @@
                     <menu_item_call.on_enable
                      function="Tools.EnableToolNotPie" />
                 </menu_item_call>
+                <menu_item_call
+                 label="Set Default Permissions..."
+                 name="Set default permissions">
+                    <menu_item_call.on_click
+                     function="Floater.ToggleOrBringToFront"
+                     parameter="perms_default" />
+                </menu_item_call>
         </menu>
         <menu
          create_jump_keys="true"
-- 
cgit v1.2.3


From 8c39617c9ac469a8635d511142148ad5a38de836 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Fri, 18 Apr 2014 12:52:07 -0600
Subject: Begin moving script editor portions of LLTextEditor to their own
 derived class. This should fix the run off segment bugs by not overriding
 LLTextBase::clearSegments() in LLTextEditor TODO: Move the rest of the script
 stuff out of LLTextEditor for simplicity sake

---
 indra/newview/skins/default/xui/en/panel_script_ed.xml | 4 ++--
 indra/newview/skins/default/xui/en/script_editor.xml   | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/script_editor.xml

(limited to 'indra/newview/skins')

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 d1b35dce9d..3e88e2dc04 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -148,7 +148,7 @@
              name="Keyword Help..." />
         </menu>
     </menu_bar>
-    <text_editor
+    <script_editor
     left="0"
      type="string"
      length="1"
@@ -165,7 +165,7 @@
      enable_tooltip_paste="true"
      word_wrap="true">
         Loading...
-    </text_editor>
+    </script_editor>
     <scroll_list
     top_pad="10"
     left="0"
diff --git a/indra/newview/skins/default/xui/en/script_editor.xml b/indra/newview/skins/default/xui/en/script_editor.xml
new file mode 100644
index 0000000000..d24833e85c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/script_editor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<script_editor
+    name="script_editor"
+    parse_urls="false">
+</script_editor>
-- 
cgit v1.2.3


From dcffb97518cb2888489c93b90862518f761967dd Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Fri, 18 Apr 2014 23:13:57 -0600
Subject: Move some more script editor functions from LLTextEditor to
 LLScriptEditor

---
 indra/newview/skins/default/xui/en/floater_region_debug_console.xml | 1 -
 indra/newview/skins/default/xui/en/panel_script_ed.xml              | 1 -
 indra/newview/skins/default/xui/en/script_editor.xml                | 4 +++-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
index 99b812a880..11172d8a3e 100755
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -21,7 +21,6 @@
     layout="topleft"
     max_length="65536"
     name="region_debug_console_output"
-    show_line_numbers="false" 
     word_wrap="true"
     track_end="true"
     read_only="true">
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 3e88e2dc04..1a4f0aff73 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -161,7 +161,6 @@
      name="Script Editor"
      text_readonly_color="DkGray"
      width="487"
-     show_line_numbers="true" 
      enable_tooltip_paste="true"
      word_wrap="true">
         Loading...
diff --git a/indra/newview/skins/default/xui/en/script_editor.xml b/indra/newview/skins/default/xui/en/script_editor.xml
index d24833e85c..b030a117fc 100644
--- a/indra/newview/skins/default/xui/en/script_editor.xml
+++ b/indra/newview/skins/default/xui/en/script_editor.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <script_editor
     name="script_editor"
-    parse_urls="false">
+    parse_urls="false"
+	show_context_menu="true"
+	show_line_numbers="true">
 </script_editor>
-- 
cgit v1.2.3


From f9bbf9e30a24bb873252cd5f0dfe7dadeb7b4b22 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Tue, 13 May 2014 10:16:03 -0600
Subject: STORM-2028 - Show context menu in script editor

---
 indra/newview/skins/default/xui/en/panel_script_ed.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

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 1a4f0aff73..76a81c4885 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -149,7 +149,7 @@
         </menu>
     </menu_bar>
     <script_editor
-    left="0"
+     left="0"
      type="string"
      length="1"
      follows="left|top|right|bottom"
@@ -162,7 +162,9 @@
      text_readonly_color="DkGray"
      width="487"
      enable_tooltip_paste="true"
-     word_wrap="true">
+     word_wrap="true"
+     show_context_menu="true"
+     show_line_numbers="true">
         Loading...
     </script_editor>
     <scroll_list
-- 
cgit v1.2.3


From c073bad6b29fa3c5167c28c286171a1bda9b5e4a Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Wed, 14 May 2014 11:04:53 -0600
Subject: Begin syntax coloring personalization

---
 indra/newview/skins/default/colors.xml             |  12 +-
 .../default/xui/en/floater_script_ed_prefs.xml     | 478 +++++++++++++++++++++
 .../skins/default/xui/en/panel_script_ed.xml       |  11 +-
 .../newview/skins/default/xui/en/script_editor.xml |  12 +-
 4 files changed, 505 insertions(+), 8 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index cb1d6aa32b..bdbece33e0 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -907,10 +907,16 @@
 
   <!-- syntax highlighting (LSL Scripts) -->
   <color
-    name="SyntaxLslComment1Sided"
-    value=".8 .3 .15 1.0" />
+    name="ScriptText"
+    reference="Black" />
+  <color
+    name="ScriptBackground"
+    reference="White" />
+  <color
+    name="ScriptCursorColor"
+    reference="Black" />
   <color
-    name="SyntaxLslComment2Sided"
+    name="SyntaxLslComment"
     value=".8 .3 .15 1.0" />
   <color
     name="SyntaxLslConstantFloat"
diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
new file mode 100644
index 0000000000..838ed031d6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="400"
+ layout="topleft"
+ name="floater_script_colors"
+ help_topic="script_colors"
+ save_rect="true"
+ title="Customize script colors"
+ width="300">
+    <text
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left="12"
+     name="color_pickers_label"
+     top="30"
+     width="200">
+     Choose desired colors:
+    </text>
+
+    <color_swatch
+    can_apply_immediately="true"
+    follows="left|top"
+    height="24"
+    label_height="0"
+    layout="topleft"
+    left="15"
+    name="text"
+    top="45"
+    width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="ScriptText" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="ScriptText" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="text_label"
+     top_delta="5"
+     width="100">
+     Text
+	</text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="15"
+     name="cursor"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="ScriptCursorColor" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="ScriptCursorColor" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="cursor_label"
+     top_delta="5"
+     width="100">
+     Cursor
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="15"
+     name="background"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="ScriptBackground" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="ScriptBackground" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="background_label"
+     top_delta="5"
+     width="100">
+    Background
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="15"
+     name="section"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslSection" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxLslSection" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="section_label"
+     top_delta="5"
+     width="100">
+    Sections
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="15"
+     name="datatype"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslDataType" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxLslDataType" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="datatype_label"
+     top_delta="5"
+     width="100">
+    Data Types
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="15"
+     name="event"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslEvent" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxLslEvent" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="event_label"
+     top_delta="5"
+     width="100">
+    Events
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="15"
+     name="comment"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslComment" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxLslComment" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="comment_label"
+     top_delta="5"
+     width="100">
+    Comment
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="170"
+     name="string_literal"
+     top="45"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslStringLiteral" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxLslStringLiteral" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="string_literal_label"
+     top_delta="5"
+     width="100">
+    String Literals
+    </text>
+
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="170"
+     name="i_constant"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslConstantInteger" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxLslConstantInteger" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="i_constant_label"
+     top_delta="5"
+     width="100">
+    Integer Const
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="170"
+     name="s_constant"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslConstantString" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxLslConstantString" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="s_constant_label"
+     top_delta="5"
+     width="100">
+    String Const
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="170"
+     name="f_constant"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslConstantFloat" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxLslConstantFloat" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="f_constant_label"
+     top_delta="5"
+     width="100">
+    Float Const
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="170"
+     name="c_constant"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxCompoundConstant" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxCompoundConstant" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="c_constant_label"
+     top_delta="5"
+     width="100">
+    Compound
+    </text>
+    <color_swatch
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="170"
+     name="flow_control"
+     top_pad="10"
+     width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslControlFlow" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyntaxLslControlFlow" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="flow_control_label"
+     top_delta="5"
+     width="100">
+    Flow Control
+    </text>
+    <color_swatch
+    can_apply_immediately="true"
+    follows="left|top"
+    height="24"
+    label_height="0"
+    layout="topleft"
+    left="170"
+    name="function"
+    top_pad="10"
+    width="44" >
+        <color_swatch.init_callback
+         function="ScriptPref.getUIColor"
+         parameter="SyntaxLslFunction" />
+        <color_swatch.commit_callback
+         function="ScriptPref.applyUIColor"
+         parameter="SyxtaxLslFunction" />
+    </color_swatch>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="false"
+     name="function_label"
+     top_delta="5"
+     width="100">
+    Function
+    </text>
+
+    <script_editor
+     left="8"
+     right="-8"
+     top="250"
+     bottom="-8"
+     type="string"
+     length="1"
+     follows="left|top|right|bottom"
+     font="Monospace"
+     height="100"
+     ignore_tab="false"
+     layout="topleft"
+     max_length="300"
+     name="Script Preview"
+     text_color="ScriptText"
+     default_color="ScriptText"
+     bg_writeable_color="ScriptBackground"
+     bg_focus_color="ScriptBackground"
+     text_readonly_color="ScriptText"
+     bg_readonly_color="ScriptBackground"
+     bg_selected_color="ScriptSelectedColor"
+     cursor_color="ScriptCursorColor"
+     show_line_numbers="true"
+     enable_tooltip_paste="true"
+     word_wrap="true">
+default
+{
+    state_entry()
+    {
+        llSay(0, "Hello!");
+    }
+}
+    </script_editor>
+</floater>
\ No newline at end of file
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 76a81c4885..755d9eaf39 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -70,6 +70,16 @@
            label="Save to file..."
            layout="topleft"
            name="SaveToFile" />
+          <menu_item_separator
+           layout="topleft" />
+          <menu_item_call
+           label="Colors..."
+           layout="topleft"
+           name="Colors">
+            <menu_item_call.on_click
+             function="Floater.Toggle"
+             parameter="script_colors"/>
+          </menu_item_call>
         </menu>
         <menu
          top="0"
@@ -159,7 +169,6 @@
      layout="topleft"
      max_length="262144"
      name="Script Editor"
-     text_readonly_color="DkGray"
      width="487"
      enable_tooltip_paste="true"
      word_wrap="true"
diff --git a/indra/newview/skins/default/xui/en/script_editor.xml b/indra/newview/skins/default/xui/en/script_editor.xml
index b030a117fc..f1c6161711 100644
--- a/indra/newview/skins/default/xui/en/script_editor.xml
+++ b/indra/newview/skins/default/xui/en/script_editor.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <script_editor
-    name="script_editor"
-    parse_urls="false"
-	show_context_menu="true"
-	show_line_numbers="true">
+ name="script_editor"
+ parse_urls="false"
+ show_context_menu="true"
+ show_line_numbers="true"
+ text_color="ScriptText"
+ default_color="ScriptText"
+ bg_writeable_color="ScriptBackground"
+ bg_focus_color="ScriptBackground">
 </script_editor>
-- 
cgit v1.2.3


From e776b600b1a76fcbe316041fc6fa8e885464daee Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Wed, 14 May 2014 14:08:24 -0600
Subject: Refactor more script editor properties away from LLTextEditor to
 LLScriptEditor

---
 indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml | 1 -
 indra/newview/skins/default/xui/en/panel_script_ed.xml         | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index 838ed031d6..ee996ee27c 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -464,7 +464,6 @@
      bg_readonly_color="ScriptBackground"
      bg_selected_color="ScriptSelectedColor"
      cursor_color="ScriptCursorColor"
-     show_line_numbers="true"
      enable_tooltip_paste="true"
      word_wrap="true">
 default
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 755d9eaf39..76677d6e95 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -172,8 +172,7 @@
      width="487"
      enable_tooltip_paste="true"
      word_wrap="true"
-     show_context_menu="true"
-     show_line_numbers="true">
+     show_context_menu="true">
         Loading...
     </script_editor>
     <scroll_list
-- 
cgit v1.2.3


From 8cd4543e6090b79b3f9bfe2bbe1f23cc98f6382e Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Fri, 16 May 2014 07:36:44 -0600
Subject: Set colors for script editor

---
 indra/newview/skins/default/xui/en/panel_script_ed.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins')

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 76677d6e95..5971082380 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -170,6 +170,14 @@
      max_length="262144"
      name="Script Editor"
      width="487"
+     text_color="ScriptText"
+     default_color="ScriptText"
+     bg_writeable_color="ScriptBackground"
+     bg_focus_color="ScriptBackground"
+     text_readonly_color="ScriptText"
+     bg_readonly_color="ScriptBackground"
+     bg_selected_color="ScriptSelectedColor"
+     cursor_color="ScriptCursorColor"
      enable_tooltip_paste="true"
      word_wrap="true"
      show_context_menu="true">
-- 
cgit v1.2.3


From be45cff44fae3f2e28ab4784e7b73aac20f736f9 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Fri, 16 May 2014 08:36:33 -0600
Subject: Typo fix

---
 indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index ee996ee27c..7b212b1d70 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -426,7 +426,7 @@
          parameter="SyntaxLslFunction" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyxtaxLslFunction" />
+         parameter="SyntaxLslFunction" />
     </color_swatch>
     <text
      type="string"
-- 
cgit v1.2.3


From 5850397c52bbc184584de6bb3e6d33bfb8abc5d7 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Fri, 16 May 2014 09:18:59 -0600
Subject: Trivial indentation change in floater_script_ed_prefs.xml

---
 .../default/xui/en/floater_script_ed_prefs.xml     | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index 7b212b1d70..a076839c09 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -21,15 +21,15 @@
     </text>
 
     <color_swatch
-    can_apply_immediately="true"
-    follows="left|top"
-    height="24"
-    label_height="0"
-    layout="topleft"
-    left="15"
-    name="text"
-    top="45"
-    width="44" >
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="15"
+     name="text"
+     top="45"
+     width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
          parameter="ScriptText" />
@@ -412,15 +412,15 @@
     Flow Control
     </text>
     <color_swatch
-    can_apply_immediately="true"
-    follows="left|top"
-    height="24"
-    label_height="0"
-    layout="topleft"
-    left="170"
-    name="function"
-    top_pad="10"
-    width="44" >
+     can_apply_immediately="true"
+     follows="left|top"
+     height="24"
+     label_height="0"
+     layout="topleft"
+     left="170"
+     name="function"
+     top_pad="10"
+     width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
          parameter="SyntaxLslFunction" />
-- 
cgit v1.2.3


From 4170ae1027b1c8e5f63b0e6c4c9f919d8d3b66c0 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Wed, 4 Jun 2014 12:52:27 -0600
Subject: STORM-2025: Part 2 - After consulting with Oz, remove subcategories
 of constants and fix highlighting

---
 indra/newview/skins/default/colors.xml             |  17 +---
 .../default/xui/en/floater_script_ed_prefs.xml     | 100 ++-------------------
 2 files changed, 6 insertions(+), 111 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index bdbece33e0..3a1f3d4e0a 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -919,23 +919,8 @@
     name="SyntaxLslComment"
     value=".8 .3 .15 1.0" />
   <color
-    name="SyntaxLslConstantFloat"
+    name="SyntaxLslConstant"
     value=".3 .1 .5 1.0" />
-  <color
-    name="SyntaxLslConstantInteger"
-    value=".1 .1 .5 1.0" />
-  <color
-    name="SyntaxLslConstantKey"
-    value=".1 .3 .5 1.0" />
-  <color
-    name="SyntaxLslConstantRotation"
-    value=".2 .4 .2 1.0" />
-  <color
-    name="SyntaxLslConstantString"
-    value=".1 .3 .5 1.0" />
-  <color
-    name="SyntaxLslConstantVector"
-    value=".2 .4 .2 1.0" />
   <color
     name="SyntaxLslControlFlow"
     value="0 0 .8 1.0" />
diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index a076839c09..8ae0df22b1 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -268,15 +268,15 @@
      label_height="0"
      layout="topleft"
      left="170"
-     name="i_constant"
+     name="constant"
      top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslConstantInteger" />
+         parameter="SyntaxLslConstant" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslConstantInteger" />
+         parameter="SyntaxLslConstant" />
     </color_swatch>
     <text
      type="string"
@@ -286,100 +286,10 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="i_constant_label"
+     name="constant_label"
      top_delta="5"
      width="100">
-    Integer Const
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="24"
-     label_height="0"
-     layout="topleft"
-     left="170"
-     name="s_constant"
-     top_pad="10"
-     width="44" >
-        <color_swatch.init_callback
-         function="ScriptPref.getUIColor"
-         parameter="SyntaxLslConstantString" />
-        <color_swatch.commit_callback
-         function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslConstantString" />
-    </color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="s_constant_label"
-     top_delta="5"
-     width="100">
-    String Const
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="24"
-     label_height="0"
-     layout="topleft"
-     left="170"
-     name="f_constant"
-     top_pad="10"
-     width="44" >
-        <color_swatch.init_callback
-         function="ScriptPref.getUIColor"
-         parameter="SyntaxLslConstantFloat" />
-        <color_swatch.commit_callback
-         function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslConstantFloat" />
-    </color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="f_constant_label"
-     top_delta="5"
-     width="100">
-    Float Const
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="24"
-     label_height="0"
-     layout="topleft"
-     left="170"
-     name="c_constant"
-     top_pad="10"
-     width="44" >
-        <color_swatch.init_callback
-         function="ScriptPref.getUIColor"
-         parameter="SyntaxCompoundConstant" />
-        <color_swatch.commit_callback
-         function="ScriptPref.applyUIColor"
-         parameter="SyntaxCompoundConstant" />
-    </color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="c_constant_label"
-     top_delta="5"
-     width="100">
-    Compound
+    Constant
     </text>
     <color_swatch
      can_apply_immediately="true"
-- 
cgit v1.2.3


From 904fd4245b517a44140a333a828d383ce4ed3005 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Sun, 8 Jun 2014 17:10:57 -0600
Subject: "sections" is apparently unused as well.

---
 indra/newview/skins/default/colors.xml             |  3 ---
 .../default/xui/en/floater_script_ed_prefs.xml     | 30 ----------------------
 2 files changed, 33 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 3a1f3d4e0a..464e633297 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -942,9 +942,6 @@
   <color
    name="SyntaxLslGodMode"
    value="0.7 .2 .35 1.0" />
-  <color
-    name="SyntaxLslSection"
-    value=".5 .1 .3 1.0" />
   <color
     name="SyntaxLslStringLiteral"
     value="0 .2 0 1.0" />
diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index 8ae0df22b1..5b2eb0820c 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -110,36 +110,6 @@
      width="100">
     Background
     </text>
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="24"
-     label_height="0"
-     layout="topleft"
-     left="15"
-     name="section"
-     top_pad="10"
-     width="44" >
-        <color_swatch.init_callback
-         function="ScriptPref.getUIColor"
-         parameter="SyntaxLslSection" />
-        <color_swatch.commit_callback
-         function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslSection" />
-    </color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="section_label"
-     top_delta="5"
-     width="100">
-    Sections
-    </text>
     <color_swatch
      can_apply_immediately="true"
      follows="left|top"
-- 
cgit v1.2.3


From a9a117388681529cd3e532de698acb05f73abda6 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Sun, 8 Jun 2014 17:49:24 -0600
Subject: Update sample script in script colors floater

---
 indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index 5b2eb0820c..b76c34f4a0 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -346,12 +346,15 @@
      cursor_color="ScriptCursorColor"
      enable_tooltip_paste="true"
      word_wrap="true">
+/* A sample script */
 default
 {
     state_entry()
     {
-        llSay(0, "Hello!");
+        // Comment
+        string greeting = "Hello";
+        llSay(PUBLIC_CHANNEL, greeting);
     }
 }
     </script_editor>
-</floater>
\ No newline at end of file
+</floater>
-- 
cgit v1.2.3


From 84eb6671630cbd11a3a5d2cfd9a0d89c19f6e58e Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Sun, 8 Jun 2014 18:41:45 -0600
Subject: Update syntax color floater with recent changes.

---
 .../default/xui/en/floater_script_ed_prefs.xml     | 71 +++++++++++-----------
 1 file changed, 35 insertions(+), 36 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index b76c34f4a0..9a65a7e158 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -2,13 +2,13 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="354"
  layout="topleft"
  name="floater_script_colors"
  help_topic="script_colors"
  save_rect="true"
  title="Customize script colors"
- width="300">
+ width="320">
     <text
      follows="left|top"
      height="15"
@@ -176,16 +176,16 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="15"
-     name="comment"
-     top_pad="10"
+     left="190"
+     name="string_literal"
+     top="45"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslComment" />
+         parameter="SyntaxLslStringLiteral" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslComment" />
+         parameter="SyntaxLslStringLiteral" />
     </color_swatch>
     <text
      type="string"
@@ -195,10 +195,10 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="comment_label"
+     name="string_literal_label"
      top_delta="5"
      width="100">
-    Comment
+    String Literals
     </text>
     <color_swatch
      can_apply_immediately="true"
@@ -206,16 +206,16 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="170"
-     name="string_literal"
-     top="45"
+     left="190"
+     name="constant"
+     top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslStringLiteral" />
+         parameter="SyntaxLslConstant" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslStringLiteral" />
+         parameter="SyntaxLslConstant" />
     </color_swatch>
     <text
      type="string"
@@ -225,28 +225,27 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="string_literal_label"
+     name="constant_label"
      top_delta="5"
      width="100">
-    String Literals
+    Constant
     </text>
-
     <color_swatch
      can_apply_immediately="true"
      follows="left|top"
      height="24"
      label_height="0"
      layout="topleft"
-     left="170"
-     name="constant"
+     left="190"
+     name="flow_control"
      top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslConstant" />
+         parameter="SyntaxLslControlFlow" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslConstant" />
+         parameter="SyntaxLslControlFlow" />
     </color_swatch>
     <text
      type="string"
@@ -256,10 +255,10 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="constant_label"
+     name="flow_control_label"
      top_delta="5"
      width="100">
-    Constant
+    Flow Control
     </text>
     <color_swatch
      can_apply_immediately="true"
@@ -267,16 +266,16 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="170"
-     name="flow_control"
+     left="190"
+     name="function"
      top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslControlFlow" />
+         parameter="SyntaxLslFunction" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslControlFlow" />
+         parameter="SyntaxLslFunction" />
     </color_swatch>
     <text
      type="string"
@@ -286,10 +285,10 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="flow_control_label"
+     name="function_label"
      top_delta="5"
      width="100">
-    Flow Control
+    Function
     </text>
     <color_swatch
      can_apply_immediately="true"
@@ -297,16 +296,16 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="170"
-     name="function"
+     left="190"
+     name="comment"
      top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslFunction" />
+         parameter="SyntaxLslComment" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslFunction" />
+         parameter="SyntaxLslComment" />
     </color_swatch>
     <text
      type="string"
@@ -316,16 +315,16 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="function_label"
+     name="comment_label"
      top_delta="5"
      width="100">
-    Function
+    Comment
     </text>
 
     <script_editor
      left="8"
      right="-8"
-     top="250"
+     top="176"
      bottom="-8"
      type="string"
      length="1"
-- 
cgit v1.2.3


From 052869130c3d03995da862518e62af674fcebc98 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Sun, 8 Jun 2014 18:46:22 -0600
Subject: Don't allow script colors floater resize

---
 indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index 9a65a7e158..d8e6935d9f 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- can_resize="true"
+ can_resize="false"
  height="354"
  layout="topleft"
  name="floater_script_colors"
-- 
cgit v1.2.3


From 58bf0dd580456f2df23c463f24791f6d580604b1 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Sun, 8 Jun 2014 18:47:17 -0600
Subject: Capitalize script colors floater for consistency.

---
 indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index d8e6935d9f..8e4bcb3eb0 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -7,7 +7,7 @@
  name="floater_script_colors"
  help_topic="script_colors"
  save_rect="true"
- title="Customize script colors"
+ title="SCRIPT COLORS"
  width="320">
     <text
      follows="left|top"
-- 
cgit v1.2.3


From 78be5c3aa5f7263698bec5bcbccb24c150f78d09 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Mon, 9 Jun 2014 16:19:20 -0600
Subject: STORM-2026 - Use more unique syntax colors by default, also clean up
 some indentation

---
 indra/newview/skins/default/colors.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 464e633297..bdc884885f 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -917,32 +917,32 @@
     reference="Black" />
   <color
     name="SyntaxLslComment"
-    value=".8 .3 .15 1.0" />
+    value="0 0.5 0 1" />
   <color
     name="SyntaxLslConstant"
-    value=".3 .1 .5 1.0" />
+    value="0 0.6 0.6 1" />
   <color
     name="SyntaxLslControlFlow"
-    value="0 0 .8 1.0" />
+    value="0.4 0 0.8 1" />
   <color
     name="SyntaxLslControlLabel"
-    value="0 0 .8 1.0" />
+    value="0 0 0.8 1" />
   <color
     name="SyntaxLslDataType"
-    value=".1 .3 .1 1.0" />
+    value="0.8 0.4 0 1" />
    <color
     name="SyntaxLslDeprecated"
-    value="0.9 0.0 0.66, 1.0" />
+    value="0.9 0.0 0.66, 1" />
   <color
    name="SyntaxLslEvent"
-   value="0 .3 .5 1.0" />
+   value="0 0.3 0.5 1" />
   <color
    name="SyntaxLslFunction"
-   value=".3 0 .5 1.0" />
+   value="0.3 0 0.5 1" />
   <color
    name="SyntaxLslGodMode"
-   value="0.7 .2 .35 1.0" />
+   value="0.7 .2 .35 1" />
   <color
     name="SyntaxLslStringLiteral"
-    value="0 .2 0 1.0" />
+    value="1 0.14 0 1" />
 </colors>
-- 
cgit v1.2.3


From 8d2e0fb3a047e349b88db80afa09fc97a7f4ff74 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Fri, 20 Jun 2014 13:43:31 -0600
Subject: STORM-2035 - Invert the background color in script editors for
 highlighting sections. Since the background color can be changed by the user,
 this ensures distinctive highlighting

---
 indra/newview/skins/default/xui/en/panel_script_ed.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

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 5971082380..eb1b954e61 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -176,7 +176,6 @@
      bg_focus_color="ScriptBackground"
      text_readonly_color="ScriptText"
      bg_readonly_color="ScriptBackground"
-     bg_selected_color="ScriptSelectedColor"
      cursor_color="ScriptCursorColor"
      enable_tooltip_paste="true"
      word_wrap="true"
-- 
cgit v1.2.3