diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-06 15:16:40 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-06 15:16:40 -0800 |
commit | 3fa1e785a6964d672682b9e5c3fcbdda0fa1f8df (patch) | |
tree | f10c1aff49e122fc7a63c78074ad2973b7d12c83 /indra/newview/skins/default/xui/en | |
parent | 0e63920569302a4f6afcbc0feb28ff379e4a4bac (diff) |
EXT-1576 "Zoom In" menu option should be disabled when the person is not in range
EXT-2306 Default voice input/output pref panel to closed
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml index 6049476a43..db2c9ea0fb 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -101,6 +101,8 @@ name="zoom_in">
<menu_item_call.on_click
function="InspectAvatar.ZoomIn"/>
+ <menu_item_call.on_visible
+ function="InspectAvatar.VisibleZoomIn"/>
</menu_item_call>
<menu_item_call
label="Pay"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index 78ae9a8224..402d0b6ab4 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -502,17 +502,4 @@ top_pad="0" width="200" /> </panel> - <!-- Until new panel is hooked up to code, we need to be able to get to - the old window to change input devices. James --> - <button - follows="left|bottom" - label="Old" - name="legacy_device_window_btn" - height="16" - left="20" - top="-270" - width="40" - commit_callback.function="Floater.Show" - commit_callback.parameter="pref_voicedevicesettings" - /> </panel> |