merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 337 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
new file mode 100644
index 0000000000..cf75da078e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_tear_off="false"
+ height="340"
+ layout="topleft"
+ name="floaterbulkperms"
+ title="Bulk change content permissions"
+ width="480">
+    <floater.string
+     name="nothing_to_modify_text">
+        Selection contains no editable contents.
+    </floater.string>
+    <floater.string
+     name="status_text">
+        Setting permissions on [NAME]
+    </floater.string>
+    <floater.string
+     name="start_text">
+        Starting permission change requests...
+    </floater.string>
+    <floater.string
+     name="done_text">
+        Finished permission change requests.
+    </floater.string>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="10"
+     name="applyto"
+     top="30"
+     width="206">
+        Content Types
+    </text>
+    <icon
+     height="16"
+     image_name="inv_item_animation.tga"
+     layout="topleft"
+     left_delta="2"
+     mouse_opaque="true"
+     name="icon_animation"
+     top_pad="14"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeAnimations"
+     height="16"
+     label="Animation"
+     layout="topleft"
+     left_pad="2"
+     name="check_animation"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_folder_bodypart.tga"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="icon_bodypart"
+     top="74"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeBodyParts"
+     height="16"
+     label="Body Parts"
+     layout="topleft"
+     left_pad="2"
+     name="check_bodypart"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_shirt.tga"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="icon_clothing"
+     top="94"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeClothing"
+     height="16"
+     label="Clothing"
+     layout="topleft"
+     left_pad="2"
+     name="check_clothing"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_gesture.tga"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="icon_gesture"
+     top="114"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeGestures"
+     height="16"
+     label="Gestures"
+     layout="topleft"
+     left_pad="2"
+     name="check_gesture"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_landmark_visited.tga"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="icon_landmark"
+     top="134"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeLandmarks"
+     height="16"
+     label="Landmarks"
+     layout="topleft"
+     left_pad="2"
+     name="check_landmark"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_notecard.tga"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="icon_notecard"
+     top="154"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeNotecards"
+     height="16"
+     label="Notecards"
+     layout="topleft"
+     left_pad="2"
+     name="check_notecard"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_object.tga"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="icon_object"
+     top="174"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeObjects"
+     height="16"
+     label="Objects"
+     layout="topleft"
+     left_pad="2"
+     name="check_object"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_script.tga"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="icon_script"
+     top="194"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeScripts"
+     height="16"
+     label="Scripts"
+     layout="topleft"
+     left_pad="2"
+     name="check_script"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_sound.tga"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="icon_sound"
+     top="214"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeSounds"
+     height="16"
+     label="Sounds"
+     layout="topleft"
+     left_pad="2"
+     name="check_sound"
+     top_delta="0"
+     width="126" />
+    <icon
+     height="16"
+     image_name="inv_item_texture.tga"
+     layout="topleft"
+     left="12"
+     mouse_opaque="true"
+     name="icon_texture"
+     top="234"
+     width="16" />
+    <check_box
+     control_name="BulkChangeIncludeTextures"
+     height="16"
+     label="Textures"
+     layout="topleft"
+     left_pad="2"
+     name="check_texture"
+     top_delta="0"
+     width="126" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Check All"
+     label_selected="All"
+     layout="topleft"
+     left="8"
+     name="check_all"
+     top="257"
+     width="100" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Uncheck All"
+     label_selected="None"
+     layout="topleft"
+     left_delta="0"
+     name="check_none"
+     top_pad="4"
+     width="100" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="10"
+     layout="topleft"
+     left="165"
+     name="newperms"
+     top="30"
+     width="206">
+        New Permissions
+    </text>
+    <check_box
+     control_name="BulkChangeShareWithGroup"
+     height="16"
+     label="Share with group"
+     layout="topleft"
+     left="170"
+     name="share_with_group"
+     top="54"
+     width="106" />
+    <check_box
+     control_name="BulkChangeEveryoneCopy"
+     height="16"
+     label="Allow anyone to copy"
+     layout="topleft"
+     left_delta="0"
+     name="everyone_copy"
+     top_pad="16"
+     width="130" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="10"
+     layout="topleft"
+     left_delta="0"
+     name="NextOwnerLabel"
+     top_pad="16"
+     width="88">
+        Next owner can:
+    </text>
+    <check_box
+     control_name="BulkChangeNextOwnerModify"
+     height="16"
+     label="Modify"
+     layout="topleft"
+     left_delta="0"
+     name="next_owner_modify"
+     top_pad="14"
+     width="78" />
+    <check_box
+     control_name="BulkChangeNextOwnerCopy"
+     height="16"
+     label="Copy"
+     layout="topleft"
+     left_delta="78"
+     name="next_owner_copy"
+     top_delta="0"
+     width="88" />
+    <check_box
+     control_name="BulkChangeNextOwnerTransfer"
+     enabled="false"
+     height="16"
+     initial_value="true"
+     label="Resell/Give away"
+     layout="topleft"
+     left_delta="88"
+     name="next_owner_transfer"
+     top_delta="0"
+     width="106" />
+    <scroll_list
+     enabled="false"
+     follows="left|top|right|bottom"
+     height="130"
+     layout="topleft"
+     left="130"
+     name="queue output"
+     top="170"
+     width="335" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Apply"
+     layout="topleft"
+     left="265"
+     name="apply"
+     top="310"
+     width="100" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Close"
+     layout="topleft"
+     left_pad="5"
+     name="close"
+     top_delta="0"
+     width="100" />
+</floater>