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/default/xui/en')

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/default/xui/en')

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/default/xui/en')

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/default/xui/en')

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 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/default/xui/en')

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/default/xui/en')

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/default/xui/en')

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 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/default/xui/en')

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