diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 0414ab5fa69050a4c685a0fea9141a40c5b3bd41..6cb90f5c05fa18e9b3603b19d0cdc1372c9612f9 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_tear_off="false"
- height="360"
+ height="310"
layout="topleft"
name="floaterbulkperms"
- title="Bulk change content permissions"
- width="280">
+ title="Edit Content Permissions"
+ width="270">
<floater.string
name="nothing_to_modify_text">
Selection contains no editable contents.
@@ -22,311 +22,285 @@
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" />
+ top="24"
+ left="10"
+ width="16" />
<icon
height="16"
- image_name="inv_folder_bodypart.tga"
- layout="topleft"
- left="12"
+ image_name="Inv_Animation"
mouse_opaque="true"
- name="icon_bodypart"
- top="74"
- width="16" />
+ name="icon_animation"
+ tool_tip="Animation"
+ left_pad="5" />
<check_box
control_name="BulkChangeIncludeBodyParts"
height="16"
- label="Body Parts"
- layout="topleft"
- left_pad="2"
name="check_bodypart"
- top_delta="0"
- width="126" />
+ left="10"
+ width="16"
+ top_pad="2" />
<icon
height="16"
- image_name="inv_item_shirt.tga"
- layout="topleft"
- left="12"
+ image_name="Inv_Eye"
+ tool_tip="Body Parts"
mouse_opaque="true"
- name="icon_clothing"
- top="94"
- width="16" />
+ name="icon_bodypart"
+ left_pad="2" />
<check_box
control_name="BulkChangeIncludeClothing"
height="16"
- label="Clothing"
- layout="topleft"
- left_pad="2"
name="check_clothing"
- top_delta="0"
- width="126" />
+ left="10"
+ width="16"
+ top_pad="5" />
<icon
height="16"
- image_name="inv_item_gesture.tga"
- layout="topleft"
- left="12"
+ image_name="Inv_Shirt"
mouse_opaque="true"
- name="icon_gesture"
- top="114"
- width="16" />
- <check_box
+ name="icon_clothing"
+ tool_tip="Clothing"
+ left_pad="2" />
+ <check_box
control_name="BulkChangeIncludeGestures"
height="16"
- label="Gestures"
- layout="topleft"
- left_pad="2"
name="check_gesture"
- top_delta="0"
- width="126" />
+ left="65"
+ width="16"
+ top="25" />
<icon
height="16"
- image_name="inv_item_notecard.tga"
+ image_name="Inv_Gesture"
layout="topleft"
- left="12"
mouse_opaque="true"
- name="icon_notecard"
- top="134"
- width="16" />
+ name="icon_gesture"
+ tool_tip="Gestures"
+ left_pad="2" />
<check_box
control_name="BulkChangeIncludeNotecards"
height="16"
- label="Notecards"
layout="topleft"
- left_pad="2"
name="check_notecard"
- top_delta="0"
- width="126" />
+ left="65"
+ width="16"
+ top_pad="5" />
<icon
height="16"
- image_name="inv_item_object.tga"
+ image_name="Inv_Notecard"
layout="topleft"
- left="12"
mouse_opaque="true"
- name="icon_object"
- top="154"
- width="16" />
- <check_box
+ name="icon_notecard"
+ tool_tip="Notecards"
+ left_pad="4" />
+ <check_box
control_name="BulkChangeIncludeObjects"
height="16"
- label="Objects"
- layout="topleft"
- left_pad="2"
name="check_object"
- top_delta="0"
- width="126" />
- <icon
+ left="65"
+ top_pad="5"
+ width="16" />
+ <icon
height="16"
- image_name="inv_item_script.tga"
- layout="topleft"
- left="12"
+ image_name="Inv_Object"
mouse_opaque="true"
- name="icon_script"
- top="174"
- width="16" />
+ name="icon_object"
+ tool_tip="Objects"
+ left_pad="2" />
<check_box
control_name="BulkChangeIncludeScripts"
height="16"
- label="Scripts"
- layout="topleft"
- left_pad="2"
name="check_script"
- top_delta="0"
- width="126" />
+ top="25"
+ left="120"
+ width="16"
+ />
<icon
height="16"
- image_name="inv_item_sound.tga"
+ image_name="Inv_Script"
layout="topleft"
- left="12"
mouse_opaque="true"
- name="icon_sound"
- top="194"
- width="16" />
+ name="icon_script"
+ tool_tip="Scripts"
+ left_pad="4" />
<check_box
control_name="BulkChangeIncludeSounds"
height="16"
- label="Sounds"
- layout="topleft"
- left_pad="2"
name="check_sound"
- top_delta="0"
- width="126" />
+ top_pad="5"
+ left="120"
+ width="16" />
<icon
height="16"
- image_name="inv_item_texture.tga"
- layout="topleft"
- left="12"
+ image_name="Inv_Sound"
mouse_opaque="true"
- name="icon_texture"
- top="214"
- width="16" />
+ name="icon_sound"
+ tool_tip="Sounds"
+ left_pad="4" />
<check_box
control_name="BulkChangeIncludeTextures"
height="16"
- label="Textures"
- layout="topleft"
- left_pad="2"
name="check_texture"
- top_delta="0"
- width="126" />
+ top_pad="5"
+ left="120"
+ width="16" />
+ <icon
+ height="16"
+ image_name="Inv_Texture"
+ mouse_opaque="true"
+ name="icon_texture"
+ tool_top="Textures"
+ left_pad="2" />
+
<button
- follows="left|top"
- height="20"
- label="Check All"
- label_selected="All"
- layout="topleft"
- left="8"
- name="check_all"
- top="257"
- width="100">
+ 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="20"
- label="Uncheck All"
+ height="23"
+ label="Clear"
label_selected="None"
layout="topleft"
- left_delta="0"
+ top_pad="8"
name="check_none"
- top_pad="4"
- width="100" >
+ width="70" >
<button.commit_callback
function="BulkPermission.UncheckAll"/>
</button>
+
<text
type="string"
length="1"
follows="left|top"
- font="SansSerif"
- height="10"
+ font="SansSerifLarge"
+ height="16"
layout="topleft"
- left="140"
+ left="10"
name="newperms"
- top="30"
- width="206">
- New Permissions
+ top="90"
+ width="250">
+ New Content Permissions
+ </text>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ layout="topleft"
+ height="16"
+ left="10"
+ name="Group:"
+ width="88">
+ Group:
</text>
<check_box
control_name="BulkChangeShareWithGroup"
height="16"
- label="Share with group"
+ label="Share"
layout="topleft"
- left="140"
+ top_pad="0"
name="share_with_group"
- top="54"
- width="106" />
+ width="88" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ name="NextOwnerLabel"
+ left="100"
+ top="110"
+ width="88">
+ Anyone:
+ </text>
<check_box
control_name="BulkChangeEveryoneCopy"
height="16"
- label="Allow anyone to copy"
+ label="Copy"
layout="topleft"
- left_delta="0"
+ top_pad="0"
name="everyone_copy"
- top_pad="16"
- width="130" />
+ width="88" />
<text
type="string"
length="1"
follows="left|top"
- height="10"
+ height="16"
layout="topleft"
- left_delta="0"
name="NextOwnerLabel"
- top_pad="16"
+ top="110"
+ left="185"
width="88">
- Next owner can:
+ Next owner:
</text>
<check_box
control_name="BulkChangeNextOwnerModify"
height="16"
label="Modify"
layout="topleft"
- left_delta="0"
name="next_owner_modify"
- top_pad="14"
- width="78" />
+ top_pad="0"
+ width="83" />
<check_box
control_name="BulkChangeNextOwnerCopy"
height="16"
label="Copy"
layout="topleft"
- left_delta="78"
+ top_pad="0"
name="next_owner_copy"
- top_delta="0"
width="88">
<check_box.commit_callback
function="BulkPermission.CommitCopy"/>
</check_box>
<check_box
control_name="BulkChangeNextOwnerTransfer"
- enabled_control="BulkChangeNextOwnerCopy"
+ enabled_control="BulkChangeNextOwnerCopy"
height="16"
+ top_pad="0"
initial_value="true"
- label="Resell/Give away"
+ label="Transfer"
layout="topleft"
- left="145"
name="next_owner_transfer"
- top_delta="20"
+ tool_tip="Next owner can give away or resell this object"
width="106" />
<scroll_list
enabled="false"
- follows="left|top|right|bottom"
- height="130"
+ follows="all"
+ height="95"
layout="topleft"
- left="120"
+ left="10"
name="queue output"
- top="185"
- width="150" />
+ top="175"
+ width="250" />
<button
follows="left|top"
- height="20"
- label="Apply"
+ height="23"
+ label="Ok"
layout="topleft"
left="65"
name="apply"
top_pad="10"
- width="100">
+ width="90">
<button.commit_callback
function="BulkPermission.Apply"/>
</button>
<button
follows="left|top"
- height="20"
- label="Close"
+ height="23"
+ label="Cancel"
layout="topleft"
left_pad="5"
name="close"
- top_delta="0"
width="100" >
<button.commit_callback
function="BulkPermission.Close"/>