summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml20
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml18
2 files changed, 34 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index e43143c8c3..d3a872c9d5 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2774,7 +2774,7 @@ even though the user gets a free copy.
label="New Script"
label_selected="New Script"
layout="topleft"
- left="10"
+ left="8"
name="button new script"
top="10"
width="134" />
@@ -2786,16 +2786,28 @@ even though the user gets a free copy.
left_pad="8"
name="button permissions"
width="134" />
- <panel_inventory_object
+ <filter_editor
+ follows="left|top|right"
+ label="Enter filter text"
+ layout="topleft"
+ top="40"
+ left="10"
+ text_pad_left="10"
+ max_length_chars="300"
+ highlight_text_field="true"
+ name="contents_filter"
+ height="23"
+ width="275" />
+ <panel_inventory_object
border="true"
border_visible="true"
bevel_style="in"
follows="left|top|right"
- height="387"
+ height="367"
layout="topleft"
left="10"
name="contents_inventory"
- top="50"
+ top="70"
width="275" />
</panel>
</tab_container>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7fe9d0efe5..324e868bd5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -465,6 +465,24 @@
<menu_item_check.on_click
function="World.AlwaysRun" />
</menu_item_check>
+ <menu_item_check
+ label="Hear Media and Sound from Avatar"
+ name="Hear Media and Sound from Avatar">
+ <menu_item_check.on_check
+ control="MediaSoundsEarLocation" />
+ <menu_item_check.on_click
+ function="Agent.ToggleHearMediaSoundFromAvatar" />
+ </menu_item_check>
+ <menu_item_check
+ label="Hear Voice from Avatar"
+ name="Hear Voice from Avatar">
+ <menu_item_check.on_check
+ control="VoiceEarLocation" />
+ <menu_item_check.on_click
+ function="Agent.ToggleHearVoiceFromAvatar" />
+ <menu_item_call.on_enable
+ control="EnableVoiceChat" />
+ </menu_item_check>
<menu_item_separator/>
<menu_item_check
label="Gestures..."