merge

1 files changed, 0 insertions, 310 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
deleted file mode 100644
index d007ceff98..0000000000
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_tear_off="false"
- height="310"
- layout="topleft"
- name="floaterbulkperms"
- help_topic="floaterbulkperms"
- title="EDIT CONTENT PERMISSIONS"
- width="270">
-    <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>
-
-    <check_box
-     control_name="BulkChangeIncludeAnimations"
-     height="16"
-     name="check_animation"
-     top="24"
-     left="10"
-     width="16" />
-    <icon
-     height="16"
-     image_name="Inv_Animation"
-     mouse_opaque="true"
-     name="icon_animation"
-     tool_tip="Animation"
-     left_pad="5" />
-    <check_box
-     control_name="BulkChangeIncludeBodyParts"
-     height="16"
-     name="check_bodypart"
-     left="10"
-     width="16"
-     top_pad="2" />
-    <icon
-     height="16"
-     image_name="Inv_Eye"
-     tool_tip="Body Parts"
-     mouse_opaque="true"
-     name="icon_bodypart"
-     left_pad="2" />
-    <check_box
-     control_name="BulkChangeIncludeClothing"
-     height="16"
-     name="check_clothing"
-     left="10"
-     width="16"
-     top_pad="5" />
-    <icon
-     height="16"
-     image_name="Inv_Shirt"
-     mouse_opaque="true"
-     name="icon_clothing"
-     tool_tip="Clothing"
-     left_pad="2" />
-      <check_box
-     control_name="BulkChangeIncludeGestures"
-     height="16"
-     name="check_gesture"
-     left="65"
-     width="16"
-     top="25" />
-    <icon
-     height="16"
-     image_name="Inv_Gesture"
-     layout="topleft"
-     mouse_opaque="true"
-     name="icon_gesture"
-     tool_tip="Gestures"
-     left_pad="2" />
-    <check_box
-     control_name="BulkChangeIncludeNotecards"
-     height="16"
-     layout="topleft"
-     name="check_notecard"
-     left="65"
-     width="16"
-     top_pad="5" />
-    <icon
-     height="16"
-     image_name="Inv_Notecard"
-     layout="topleft"
-     mouse_opaque="true"
-     name="icon_notecard"
-     tool_tip="Notecards"
-     left_pad="4" />
-   <check_box
-     control_name="BulkChangeIncludeObjects"
-     height="16"
-     name="check_object"
-     left="65"
-     top_pad="5"
-     width="16" />
-   <icon
-     height="16"
-     image_name="Inv_Object"
-     mouse_opaque="true"
-     name="icon_object"
-     tool_tip="Objects"
-     left_pad="2" />
-    <check_box
-     control_name="BulkChangeIncludeScripts"
-     height="16"
-     name="check_script"
-     top="25"
-     left="120"
-     width="16"
-     />
-    <icon
-     height="16"
-     image_name="Inv_Script"
-     layout="topleft"
-     mouse_opaque="true"
-     name="icon_script"
-     tool_tip="Scripts"
-     left_pad="4" />
-    <check_box
-     control_name="BulkChangeIncludeSounds"
-     height="16"
-     name="check_sound"
-     top_pad="5"
-     left="120"
-     width="16" />
-    <icon
-     height="16"
-     image_name="Inv_Sound"
-     mouse_opaque="true"
-     name="icon_sound"
-     tool_tip="Sounds"
-     left_pad="4" />
-    <check_box
-     control_name="BulkChangeIncludeTextures"
-     height="16"
-     name="check_texture"
-     top_pad="5"
-     left="120"
-     width="16" />
-    <icon
-     height="16"
-     image_name="Inv_Texture"
-     mouse_opaque="true"
-     name="icon_texture"
-     tool_tip="Textures"
-     left_pad="2" />
-
-    <button
-      height="23"
-    layout="topleft"
-   name="check_all"
-     label="√ All"
-     left="180"
-     top="26"
-     width="70">
-      <button.commit_callback
-       function="BulkPermission.CheckAll" />
-    </button>
-    <button
-     follows="left|top"
-     height="23"
-     label="Clear"
-     label_selected="None"
-     layout="topleft"
-     top_pad="8"
-     name="check_none"
-     width="70" >
-      <button.commit_callback
-       function="BulkPermission.UncheckAll"/>
-    </button>
-
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerifLarge"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="newperms"
-     top="90"
-     width="250">
-        New Content Permissions
-    </text>
-      <text
-       type="string"
-       length="1"
-      follows="left|top"
-      layout="topleft"
-       height="16"
-     left="10"
-      name="GroupLabel"
-       width="88">
-       Group:
-    </text>
-    <check_box
-     control_name="BulkChangeShareWithGroup"
-     height="16"
-     label="Share"
-     layout="topleft"
-     top_pad="0"
-     name="share_with_group"
-     width="88" />
-        <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     name="AnyoneLabel"
-     left="100"
-     top="110"
-     width="88">
-        Anyone:
-    </text>
-    <check_box
-     control_name="BulkChangeEveryoneCopy"
-     height="16"
-     label="Copy"
-     layout="topleft"
-     top_pad="0"
-     name="everyone_copy"
-     width="88" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     name="NextOwnerLabel"
-     top="110"
-     left="185"
-     width="88">
-        Next owner:
-    </text>
-    <check_box
-     control_name="BulkChangeNextOwnerModify"
-     height="16"
-     label="Modify"
-     layout="topleft"
-     name="next_owner_modify"
-     top_pad="0"
-     width="83" />
-    <check_box
-     control_name="BulkChangeNextOwnerCopy"
-     height="16"
-     label="Copy"
-     layout="topleft"
-     top_pad="0"
-     name="next_owner_copy"
-     width="88">
-      <check_box.commit_callback
-       function="BulkPermission.CommitCopy"/>
-     </check_box>
-     <check_box
-     control_name="BulkChangeNextOwnerTransfer"
-     enabled_control="BulkChangeNextOwnerCopy"
-     height="16"
-     top_pad="0"
-     initial_value="true"
-     label="Transfer"
-     layout="topleft"
-     name="next_owner_transfer"
-     tool_tip="Next owner can give away or resell this object"
-     width="106" />
-    <scroll_list
-     enabled="false"
-     follows="all"
-     height="95"
-     layout="topleft"
-     left="10"
-     name="queue output"
-     top="175"
-     width="250" />
-    <button
-     follows="left|top"
-     height="23"
-     label="OK"
-     layout="topleft"
-     left="65"
-     name="apply"
-     top_pad="10"
-     width="90">
-      <button.commit_callback
-       function="BulkPermission.Apply"/>
-    </button>
-    <button
-     follows="left|top"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     left_pad="5"
-     name="close"
-     width="100" >
-      <button.commit_callback
-       function="BulkPermission.Close"/>
-    </button>
-</floater>