summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-12 14:06:22 -0500
committerOz Linden <oz@lindenlab.com>2010-11-12 14:06:22 -0500
commit5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (patch)
treec0918615c3e549c03dc212e723b89a6bdd9e633f /indra/newview/skins/default/xui/en
parent4dcf8288be0ba10637ab2dce8c3400fa28bf5972 (diff)
parent29a36c21db57729ff86785745c90ffbf93875edb (diff)
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml28
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml311
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml359
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_colors.xml346
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml167
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_move.xml206
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_privacy.xml35
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_setup.xml49
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml140
9 files changed, 892 insertions, 749 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 50d0011338..36108442f3 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -65,13 +65,6 @@
name="display" />
<panel
class="panel_preference"
- filename="panel_preferences_privacy.xml"
- label="Privacy"
- layout="topleft"
- help_topic="preferences_im_tab"
- name="im" />
- <panel
- class="panel_preference"
filename="panel_preferences_sound.xml"
label="Sound &amp; Media"
layout="topleft"
@@ -86,6 +79,13 @@
name="chat" />
<panel
class="panel_preference"
+ filename="panel_preferences_move.xml"
+ label="Move &amp; View"
+ layout="topleft"
+ help_topic="preferences_move_tab"
+ name="audio" />
+ <panel
+ class="panel_preference"
filename="panel_preferences_alerts.xml"
label="Notifications"
layout="topleft"
@@ -93,6 +93,20 @@
name="msgs" />
<panel
class="panel_preference"
+ filename="panel_preferences_colors.xml"
+ label="Colors"
+ layout="topleft"
+ help_topic="preferences_im_tab"
+ name="colors" />
+ <panel
+ class="panel_preference"
+ filename="panel_preferences_privacy.xml"
+ label="Privacy"
+ layout="topleft"
+ help_topic="preferences_im_tab"
+ name="im" />
+ <panel
+ class="panel_preference"
filename="panel_preferences_setup.xml"
label="Setup"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 006d7895b2..15d1222d00 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -13,238 +13,17 @@
name="aspect_ratio_text">
[NUM]:[DEN]
</panel.string>
- <panel.string
- name="middle_mouse">
- Middle Mouse
- </panel.string>
- <slider
- can_edit_text="false"
- control_name="ActiveFloaterTransparency"
- decimal_digits="2"
- follows="left|top"
- height="16"
- increment="0.01"
- initial_value="0.8"
- layout="topleft"
- label_width="120"
- label="Active floater opacity:"
- left="240"
- max_val="1.00"
- min_val="0.00"
- name="active"
- show_text="true"
- top="75"
- width="290" />
- <slider
- can_edit_text="false"
- control_name="InactiveFloaterTransparency"
- decimal_digits="2"
- follows="left|top"
- height="16"
- increment="0.01"
- initial_value="0.5"
- layout="topleft"
- label_width="120"
- label="Inctive floater opacity:"
- left="240"
- max_val="1.00"
- min_val="0.00"
- name="active"
- show_text="true"
- top_pad="15"
- width="290" />
- <icon
- follows="left|top"
- height="18"
- image_name="Cam_FreeCam_Off"
- layout="topleft"
- name="camera_icon"
- mouse_opaque="false"
- visible="true"
- width="18"
- left="30"
- top="10"/>
- <slider
- can_edit_text="true"
- control_name="CameraAngle"
- decimal_digits="2"
- follows="left|top"
- height="16"
- increment="0.025"
- initial_value="1.57"
- layout="topleft"
- label_width="100"
- label="View angle"
- left_pad="30"
- max_val="2.97"
- min_val="0.17"
- name="camera_fov"
- show_text="false"
- width="240" />
- <slider
- can_edit_text="true"
- control_name="CameraOffsetScale"
- decimal_digits="2"
- follows="left|top"
- height="16"
- increment="0.025"
- initial_value="1"
- layout="topleft"
- label="Distance"
- left_delta="0"
- label_width="100"
- max_val="3"
- min_val="0.5"
- name="camera_offset_scale"
- show_text="false"
- width="240"
- top_pad="5"/>
- <text
- follows="left|top"
- type="string"
- length="1"
- height="10"
- left="80"
- name="heading2"
- width="240"
- top_pad="5">
-Automatic position for:
- </text>
- <check_box
- control_name="EditCameraMovement"
- height="20"
- follows="left|top"
- label="Build/Edit"
- layout="topleft"
- left_delta="30"
- name="edit_camera_movement"
- tool_tip="Use automatic camera positioning when entering and exiting edit mode"
- width="280"
- top_pad="5" />
- <check_box
- control_name="AppearanceCameraMovement"
- follows="left|top"
- height="16"
- label="Appearance"
- layout="topleft"
- name="appearance_camera_movement"
- tool_tip="Use automatic camera positioning while in edit mode"
- width="242" />
- <check_box
- control_name="SidebarCameraMovement"
- follows="left|top"
- height="16"
- initial_value="true"
- label="Sidebar"
- layout="topleft"
- name="appearance_sidebar_positioning"
- tool_tip="Use automatic camera positioning for sidebar"
- width="242" />
- <icon
- follows="left|top"
- height="18"
- image_name="Move_Walk_Off"
- layout="topleft"
- name="avatar_icon"
- mouse_opaque="false"
- visible="true"
- width="18"
- top_pad="2"
- left="30"
- />
- <check_box
- control_name="FirstPersonAvatarVisible"
- follows="left|top"
- height="20"
- label="Show me in Mouselook"
- layout="topleft"
- left_pad="30"
- name="first_person_avatar_visible"
- width="256" />
-
- <check_box
- control_name="ArrowKeysAlwaysMove"
- follows="left|top"
- height="20"
- label="Arrow keys always move me"
- layout="topleft"
- left_delta="0"
- name="arrow_keys_move_avatar_check"
- width="237"
- top_pad="0"/>
- <check_box
- control_name="AllowTapTapHoldRun"
- follows="left|top"
- height="20"
- label="Tap-tap-hold to run"
- layout="topleft"
- left_delta="0"
- name="tap_tap_hold_to_run"
- width="237"
- top_pad="0"/>
- <check_box
- control_name="LipSyncEnabled"
- follows="left|top"
- height="20"
- label="Move avatar lips when speaking"
- layout="topleft"
- left_delta="0"
- name="enable_lip_sync"
- width="237"
- top_pad="0" />
- <check_box
- control_name="UseChatBubbles"
- follows="left|top"
- height="16"
- label="Bubble chat"
- layout="topleft"
- left="78"
- top_pad="6"
- name="bubble_text_chat"
- width="150" />
- <slider
- control_name="ChatBubbleOpacity"
- follows="left|top"
- height="16"
- increment="0.05"
- initial_value="1"
- label="Opacity"
- layout="topleft"
- left="80"
- label_width="156"
- name="bubble_chat_opacity"
- top_pad = "10"
- width="347" />
- <color_swatch
- can_apply_immediately="true"
- color="0 0 0 1"
- control_name="BackgroundChatColor"
- follows="left|top"
- height="50"
- layout="topleft"
- left_pad="30"
- top="190"
- name="background"
- tool_tip="Choose color for bubble chat"
- width="38">
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="BackgroundChatColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="BackgroundChatColor" />
- </color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="12"
layout="topleft"
- left="80"
+ left="33"
name="UI Size:"
top_pad="25"
- width="160">
- UI size
+ width="100">
+ UI size:
</text>
<slider
control_name="UIScaleFactor"
@@ -259,7 +38,7 @@ Automatic position for:
min_val="0.75"
name="ui_scale_slider"
top_pad="-14"
- width="180" />
+ width="250" />
<check_box
control_name="ShowScriptErrors"
follows="left|top"
@@ -298,65 +77,41 @@ Automatic position for:
top_delta="0"
width="315" />
</radio_group>
- <check_box
+
+ <check_box
follows="top|left"
- enabled_control="EnableVoiceChat"
- control_name="PushToTalkToggle"
height="15"
- label="Toggle speak on/off when I press:"
+ label="Allow Multiple Viewer"
layout="topleft"
left="30"
- name="push_to_talk_toggle_check"
- width="237"
- tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/>
- <line_editor
+ name="allow_multiple_viewer_check"
+ top_pad="20"
+ width="237"/>
+ <check_box
follows="top|left"
- control_name="PushToTalkButton"
- enabled="false"
- enabled_control="EnableVoiceChat"
- height="23"
- left="80"
- max_length_bytes="200"
- name="modifier_combo"
- label="Push-to-Speak trigger"
+ height="15"
+ label="Show Grid Selection at login"
+ layout="topleft"
+ left="30"
+ name="show_grid_selection_check"
top_pad="5"
- width="200" />
- <button
- layout="topleft"
+ width="237"/>
+ <check_box
follows="top|left"
- enabled_control="EnableVoiceChat"
- height="23"
- label="Set Key"
- left_pad="5"
- name="set_voice_hotkey_button"
- width="100">
- <button.commit_callback
- function="Pref.VoiceSetKey" />
- </button>
- <button
- enabled_control="EnableVoiceChat"
+ height="15"
+ label="Show Advanced Menu"
+ layout="topleft"
+ left="30"
+ name="show_advanced_menu_check"
+ top_pad="5"
+ width="237"/>
+ <check_box
follows="top|left"
- halign="center"
- height="23"
- image_overlay="Refresh_Off"
- layout="topleft"
- tool_tip="Reset to Middle Mouse Button"
- mouse_opaque="true"
- name="set_voice_middlemouse_button"
- left_pad="5"
- width="25">
- <button.commit_callback
- function="Pref.VoiceSetMiddleMouse" />
- </button>
- <button
- height="23"
- label="Other Devices"
- left="30"
- name="joystick_setup_button"
- top_pad="27"
- width="155">
- <button.commit_callback
- function="Floater.Show"
- parameter="pref_joystick" />
- </button>
+ height="15"
+ label="Show Developer Menu"
+ layout="topleft"
+ left="30"
+ name="show_develop_menu_check"
+ top_pad="5"
+ width="237"/>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 85824c2576..a1082d9c32 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -23,7 +23,7 @@
height="30"
layout="topleft"
left="40"
- control_name="ChatFontSize"
+ control_name="ChatFontSize"
name="chat_font_size"
top_pad="0"
width="440">
@@ -55,291 +55,7 @@
top_delta="0"
width="125" />
</radio_group>
-
- <text
- follows="left|top"
- layout="topleft"
- left="30"
- height="12"
- name="font_colors"
- top_pad="10"
- width="120"
- >
- Font colors:
- </text>
-
- <color_swatch
- can_apply_immediately="true"
- follows="left|top"
- height="47"
- layout="topleft"
- left="40"
- name="user"
- top_pad="10"
- width="44" >
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="UserChatColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="UserChatColor" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="text_box1"
- top_delta="5"
- width="95">
- Me
- </text>
- <color_swatch
- can_apply_immediately="true"
- follows="left|top"
- height="47"
- layout="topleft"
- left="190"
- name="agent"
- top_pad="-15"
- width="44" >
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="AgentChatColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="AgentChatColor" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="text_box2"
- top_delta="5"
- width="95">
- Others
- </text>
- <color_swatch
- can_apply_immediately="true"
- color="LtGray"
- follows="left|top"
- height="47"
- label_width="60"
- layout="topleft"
- left="360"
- name="im"
- top_pad="-15"
- width="44">
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="IMChatColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="IMChatColor" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="text_box3"
- top_delta="5"
- width="95">
- IM
- </text>
- <color_swatch
- can_apply_immediately="true"
- color="LtGray"
- follows="left|top"
- height="47"
- label_width="44"
- layout="topleft"
- left="40"
- name="system"
- top_pad="22"
- width="44" >
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="SystemChatColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="SystemChatColor" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="text_box4"
- top_delta="5"
- width="95">
- System
- </text>
- <color_swatch
- can_apply_immediately="true"
- color="Red"
- follows="left|top"
- height="47"
- layout="topleft"
- left="190"
- name="script_error"
- top_pad="-15"
- width="44">
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="ScriptErrorColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="ScriptErrorColor" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="text_box5"
- top_delta="5"
- width="95">
- Errors
- </text>
- <color_swatch
- can_apply_immediately="true"
- color="EmphasisColor_35"
- follows="left|top"
- height="47"
- layout="topleft"
- left="360"
- name="objects"
- top_pad="-15"
- width="44" >
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="ObjectChatColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="ObjectChatColor" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="text_box6"
- top_delta="5"
- width="95">
- Objects
- </text>
- <color_swatch
- can_apply_immediately="true"
- color="LtYellow"
- follows="left|top"
- height="47"
- layout="topleft"
- left="40"
- name="owner"
- top_pad="22"
- width="44" >
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="llOwnerSayChatColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="llOwnerSayChatColor" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="text_box7"
- top_delta="5"
- width="95">
- Owner
- </text>
- <color_swatch
- can_apply_immediately="true"
- color="EmphasisColor"
- follows="left|top"
- height="47"
- layout="topleft"
- left="190"
- name="links"
- top_pad="-15"
- width="44" >
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="HTMLLinkColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="HTMLLinkColor" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="text_box9"
- top_delta="5"
- width="95">
- URLs
- </text>
- <spinner
- control_name="NearbyToastLifeTime"
- decimal_digits="0"
- follows="left|top"
- height="23"
- increment="1"
- initial_value="23"
- label="Nearby chat toasts life time:"
- label_width="190"
- layout="topleft"
- left="290"
- max_val="60"
- min_val="1"
- name="nearby_toasts_lifetime"
- top_pad="33"
- width="210" />
- <spinner
- control_name="NearbyToastFadingTime"
- decimal_digits="0"
- follows="left|top"
- height="23"
- increment="1"
- initial_value="3"
- label="Nearby chat toasts fading time:"
- label_width="190"
- layout="topleft"
- left_delta="00"
- max_val="60"
- min_val="0"
- name="nearby_toasts_fadingtime"
- top_pad="15"
- width="210" />
+
<check_box
control_name="PlayTypingAnim"
height="16"
@@ -348,7 +64,7 @@
layout="topleft"
left="30"
name="play_typing_animation"
- top="205"
+ top_pad="10"
width="400" />
<check_box
enabled="false"
@@ -368,6 +84,16 @@
name="plain_text_chat_history"
top_pad="5"
width="400" />
+ <check_box
+ control_name="UseChatBubbles"
+ follows="left|top"
+ height="16"
+ label="Bubble Chat"
+ layout="topleft"
+ left_delta="0"
+ top_pad="5"
+ name="bubble_text_chat"
+ width="150" />
<text
name="show_ims_in_label"
follows="left|top"
@@ -375,7 +101,7 @@
left="30"
height="20"
width="170"
- top_pad="7">
+ top_pad="15">
Show IMs in:
</text>
<text
@@ -385,9 +111,8 @@
top_delta="0"
left="170"
height="20"
- width="130"
- text_color="White_25"
- >
+ width="130"
+ text_color="White_25">
(requires restart)
</text>
<radio_group
@@ -401,7 +126,7 @@
width="150">
<radio_item
height="16"
- label="Separate windows"
+ label="Separate Windows"
layout="topleft"
left="0"
name="radio"
@@ -422,19 +147,19 @@
name="disable_toast_label"
follows="left|top"
layout="topleft"
- top_delta="-22"
- left="280"
+ top_pad="20"
+ left="30"
height="10"
width="180">
- Enable Incoming Chat popups:
+ Enable incoming chat popups:
</text>
<check_box
control_name="EnableGroupChatPopups"
name="EnableGroupChatPopups"
label="Group Chats"
layout="topleft"
- top_delta="18"
- left="295"
+ top_pad="5"
+ left_delta="10"
height="20"
tool_tip="Check to see popups when a Group Chat message arrives"
width="400" />
@@ -443,11 +168,43 @@
name="EnableIMChatPopups"
label="IM Chats"
layout="topleft"
- top_delta="22"
- left="295"
- height="20"
+ top_pad="5"
+ height="16"
tool_tip="Check to see popups when an instant message arrives"
width="400" />
+ <spinner
+ control_name="NearbyToastLifeTime"
+ decimal_digits="0"
+ follows="left|top"
+ height="23"
+ increment="1"
+ initial_value="23"
+ label="Nearby chat toasts life time:"
+ label_width="190"
+ layout="topleft"
+ left="45"
+ max_val="60"
+ min_val="1"
+ name="nearby_toasts_lifetime"
+ top_pad="10"
+ width="230" />
+ <spinner
+ control_name="NearbyToastFadingTime"
+ decimal_digits="0"
+ follows="left|top"
+ height="23"
+ increment="1"
+ initial_value="3"
+ label="Nearby chat toasts fading time:"
+ label_width="190"
+ layout="topleft"
+ left_delta="0"
+ max_val="60"
+ min_val="0"
+ name="nearby_toasts_fadingtime"
+ top_pad="3"
+ width="230" />
+
<check_box
control_name="TranslateChat"
enabled="true"
@@ -456,7 +213,7 @@
layout="topleft"
left="30"
name="translate_chat_checkbox"
- bottom_delta="40"
+ bottom_delta="30"
width="400" />
<text
bottom_delta="30"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
new file mode 100644
index 0000000000..036730a646
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="408"
+ label="Colors"
+ layout="topleft"
+ left="102"
+ name="colors_panel"
+ top="1"
+ width="517">
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="15"
+ layout="topleft"
+ left="30"
+ name="effects_color_textbox"
+ top_pad="10"
+ width="200">
+ My effects (selection beam):
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ layout="topleft"
+ left="40"
+ name="effect_color_swatch"
+ tool_tip="Click to open Color Picker"
+ width="44">
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="EffectColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="EffectColor" />
+ <color_swatch.caption_text
+ height="0" />
+ </color_swatch>
+ <text
+ follows="left|top"
+ layout="topleft"
+ left="30"
+ height="12"
+ name="font_colors"
+ top_pad="20"
+ width="120"
+ >
+ Chat font colors:
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ layout="topleft"
+ left="40"
+ name="user"
+ top_pad="10"
+ width="44" >
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="UserChatColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="UserChatColor" />
+ </color_swatch>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="5"
+ mouse_opaque="false"
+ name="text_box1"
+ top_delta="5"
+ width="95">
+ Me
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ layout="topleft"
+ left="190"
+ name="agent"
+ top_pad="-15"
+ width="44" >
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="AgentChatColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="AgentChatColor" />
+ </color_swatch>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="5"
+ mouse_opaque="false"
+ name="text_box2"
+ top_delta="5"
+ width="95">
+ Others
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ color="LtGray"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ label_width="60"
+ layout="topleft"
+ left="360"
+ name="im"
+ top_pad="-15"
+ width="44">
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="IMChatColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="IMChatColor" />
+ </color_swatch>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="5"
+ mouse_opaque="false"
+ name="text_box3"
+ top_delta="5"
+ width="95">
+ IM
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ color="LtGray"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ label_width="44"
+ layout="topleft"
+ left="40"
+ name="system"
+ top_pad="22"
+ width="44" >
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="SystemChatColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="SystemChatColor" />
+ </color_swatch>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="5"
+ mouse_opaque="false"
+ name="text_box4"
+ top_delta="5"
+ width="95">
+ System
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ color="Red"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ layout="topleft"
+ left="190"
+ name="script_error"
+ top_pad="-15"
+ width="44">
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="ScriptErrorColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="ScriptErrorColor" />
+ </color_swatch>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="5"
+ mouse_opaque="false"
+ name="text_box5"
+ top_delta="5"
+ width="95">
+ Errors
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ color="EmphasisColor_35"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ layout="topleft"
+ left="360"
+ name="objects"
+ top_pad="-15"
+ width="44" >
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="ObjectChatColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="ObjectChatColor" />
+ </color_swatch>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="5"
+ mouse_opaque="false"
+ name="text_box6"
+ top_delta="5"
+ width="95">
+ Objects
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ color="LtYellow"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ layout="topleft"
+ left="40"
+ name="owner"
+ top_pad="22"
+ width="44" >
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="llOwnerSayChatColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="llOwnerSayChatColor" />
+ </color_swatch>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="5"
+ mouse_opaque="false"
+ name="text_box7"
+ top_delta="5"
+ width="95">
+ Owner
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ color="EmphasisColor"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ layout="topleft"
+ left="190"
+ name="links"
+ top_pad="-15"
+ width="44" >
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="HTMLLinkColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="HTMLLinkColor" />
+ </color_swatch>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="5"
+ mouse_opaque="false"
+ name="text_box9"
+ top_delta="5"
+ width="95">
+ URLs
+ </text>
+ <text
+ follows="left|top"
+ layout="topleft"
+ left="30"
+ height="12"
+ name="bubble_chat"
+ top_pad="28"
+ width="120"
+ >
+ Bubble chat:
+ </text>
+ <color_swatch
+ can_apply_immediately="true"
+ color="0 0 0 1"
+ control_name="BackgroundChatColor"
+ follows="left|top"
+ height="24"
+ label_height="0"
+ layout="topleft"
+ left_delta="10"
+ top_pad="5"
+ name="background"
+ tool_tip="Choose color for bubble chat"
+ width="44">
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="BackgroundChatColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="BackgroundChatColor" />
+ </color_swatch>
+ <slider
+ control_name="ChatBubbleOpacity"
+ follows="left|top"
+ height="16"
+ increment="0.05"
+ initial_value="1"
+ label="Opacity"
+ layout="topleft"
+ left_pad="15"
+ label_width="56"
+ name="bubble_chat_opacity"
+ top_delta = "6"
+ width="347" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 392d50fc42..a660b5d785 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -106,7 +106,7 @@
height="15"
layout="topleft"
left="30"
- top_pad="14"
+ top_pad="8"
name="maturity_desired_prompt"
width="200">
I want to access content rated:
@@ -177,7 +177,7 @@
layout="topleft"
left="30"
name="start_location_textbox"
- top_pad="15"
+ top_pad="8"
width="394">
Start location:
</text>
@@ -216,7 +216,7 @@
layout="topleft"
left="30"
name="name_tags_textbox"
- top_pad="14"
+ top_pad="10"
width="400">
Name tags:
</text>
@@ -224,8 +224,8 @@
control_name="AvatarNameTagMode"
height="20"
layout="topleft"
- left="50"
- top_pad="5"
+ left="35"
+ top_pad="0"
name="Name_Tag_Preference">
<radio_item
label="Off"
@@ -261,9 +261,9 @@
height="16"
label="My name"
layout="topleft"
- left="70"
+ left="35"
name="show_my_name_checkbox1"
- top_pad="0"
+ top_pad="2"
width="100" />
<check_box
control_name="NameTagShowUsernames"
@@ -271,7 +271,7 @@
height="16"
label="Usernames"
layout="topleft"
- left_pad="70"
+ left_pad="50"
name="show_slids"
tool_tip="Show username, like bobsmith123"
top_delta="0" />
@@ -281,72 +281,102 @@
height="16"
label="Group titles"
layout="topleft"
- left="70"
+ left="35"
width="100"
name="show_all_title_checkbox1"
tool_tip="Show group titles, like Officer or Member"
- top_pad="5" />
-
- <check_box
- control_name="NameTagShowFriends"
+ top_pad="3" />
+ <check_box
+ control_name="NameTagShowFriends"
enabled_control="AvatarNameTagMode"
height="16"
- label="Highlight friends"
+ label="Highlight friends"
layout="topleft"
- left_pad="70"
- name="show_friends"
- tool_tip="Highlight the name tags of your friends"
- top_delta="0" />
-
+ left_pad="50"
+ name="show_friends"
+ tool_tip="Highlight the name tags of your friends"/>
+ <check_box
+ control_name="UseDisplayNames"
+ follows="top|left"
+ height="16"
+ label="View Display Names"
+ layout="topleft"
+ left="35"
+ name="display_names_check"
+ width="237"
+ tool_tip="Check to use display names in chat, IM, name tags, etc."
+ top_pad="3"/>
+
+ <check_box
+ control_name="EnableUIHints"
+ follows="top|left"
+ height="16"
+ label="Enable Viewer UI Hints"
+ layout="topleft"
+ left="27"
+ name="viewer_hints_check"
+ top_pad="5"
+ width="237"/>
+
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="15"
+ layout="topleft"
+ left="30"
+ name="inworld_typing_rg_label"
+ top_pad="6"
+ width="400">
+ Pressing letter keys:
+ </text>
+ <radio_group
+ height="20"
+ layout="topleft"
+ left="35"
+ top_pad="0"
+ name="inworld_typing_preference">
+ <radio_item
+ label="Starts local chat"
+ name="radio_button1"
+ top_delta="20"
+ layout="topleft"
+ height="16"
+ left="0"
+ value="0"
+ width="150" />
+ <radio_item
+ label="Affects movement (i.e. WASD)"
+ left_pad="0"
+ layout="topleft"
+ top_delta="0"
+ height="16"
+ name="radio_button2"
+ value="1"
+ width="75" />
+ </radio_group>
+
<text
type="string"
length="1"
follows="left|top"
- height="15"
+ height="13"
layout="topleft"
left="30"
- name="effects_color_textbox"
- top_pad="9"
- width="200">
- My effects:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="13"
- layout="topleft"
- left_pad="5"
- name="title_afk_text"
- top_delta="0"
- width="190">
- Away timeout:
+ name="title_afk_text"
+ top_pad="4"
+ width="190">
+ Away timeout:
</text>
- <color_swatch
- can_apply_immediately="true"
- follows="left|top"
- height="50"
- layout="topleft"
- left="50"
- name="effect_color_swatch"
- tool_tip="Click to open Color Picker"
- width="38">
- <color_swatch.init_callback
- function="Pref.getUIColor"
- parameter="EffectColor" />
- <color_swatch.commit_callback
- function="Pref.applyUIColor"
- parameter="EffectColor" />
- </color_swatch>
<combo_box
- height="23"
- layout="topleft"
- control_name="AFKTimeout"
- left_pad="160"
- label="Away timeout:"
- top_delta="0"
- name="afk"
- width="130">
+ height="23"
+ layout="topleft"
+ control_name="AFKTimeout"
+ left="30"
+ label="Away timeout:"
+ top_pad="2"
+ name="afk"
+ width="130">
<combo_box.item
label="2 minutes"
name="item0"
@@ -368,17 +398,6 @@
name="item4"
value="0" />
</combo_box>
- <check_box
-control_name="UseDisplayNames"
-follows="top|left"
-height="14"
-label="View Display Names"
-layout="topleft"
-left="30"
-name="display_names_check"
-width="237"
-tool_tip="Check to use display names in chat, IM, name tags, etc."
-top_pad="20"/>
<text
type="string"
length="1"
@@ -388,7 +407,7 @@ top_pad="20"/>
left="30"
mouse_opaque="false"
name="text_box3"
- top_pad="10"
+ top_pad="5"
width="240">
Busy mode response:
</text>
@@ -399,11 +418,11 @@ top_pad="20"/>
use_ellipses="false"
commit_on_focus_lost = "true"
follows="left|top"
- height="42"
+ height="29"
layout="topleft"
left="50"
name="busy_response"
- width="450"
+ width="470"
word_wrap="true">
log_in_to_change
</text_editor>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
new file mode 100644
index 0000000000..ec80efe188
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="left|top|right|bottom"
+ height="408"
+ label="Move"
+ layout="topleft"
+ left="102"
+ name="move_panel"
+ top="1"
+ width="517">
+ <icon
+ follows="left|top"
+ height="18"
+ image_name="Cam_FreeCam_Off"
+ layout="topleft"
+ name="camera_icon"
+ mouse_opaque="false"
+ visible="true"
+ width="18"
+ left="30"
+ top="10"/>
+ <slider
+ can_edit_text="true"
+ control_name="CameraAngle"
+ decimal_digits="2"
+ follows="left|top"
+ height="16"
+ increment="0.025"
+ initial_value="1.57"
+ layout="topleft"
+ label_width="100"
+ label="View angle"
+ left_pad="30"
+ max_val="2.97"
+ min_val="0.17"
+ name="camera_fov"
+ show_text="false"
+ width="240" />
+ <slider
+ can_edit_text="true"
+ control_name="CameraOffsetScale"
+ decimal_digits="2"
+ follows="left|top"
+ height="16"
+ increment="0.025"
+ initial_value="1"
+ layout="topleft"
+ label="Distance"
+ left_delta="0"
+ label_width="100"
+ max_val="3"
+ min_val="0.5"
+ name="camera_offset_scale"
+ show_text="false"
+ width="240"
+ top_pad="5"/>
+ <text
+ follows="left|top"
+ type="string"
+ length="1"
+ height="10"
+ left="80"
+ name="heading2"
+ width="270"
+ top_pad="5">
+ Automatic position for:
+ </text>
+ <check_box
+ control_name="EditCameraMovement"
+ height="20"
+ follows="left|top"
+ label="Build/Edit"
+ layout="topleft"
+ left_delta="30"
+ name="edit_camera_movement"
+ tool_tip="Use automatic camera positioning when entering and exiting edit mode"
+ width="280"
+ top_pad="5" />
+ <check_box
+ control_name="AppearanceCameraMovement"
+ follows="left|top"
+ height="16"
+ label="Appearance"
+ layout="topleft"
+ name="appearance_camera_movement"
+ tool_tip="Use automatic camera positioning while in edit mode"
+ width="242" />
+ <check_box
+ control_name="SidebarCameraMovement"
+ follows="left|top"
+ height="16"
+ initial_value="true"
+ label="Sidebar"
+ layout="topleft"
+ name="appearance_sidebar_positioning"
+ tool_tip="Use automatic camera positioning for sidebar"
+ width="242" />
+ <icon
+ follows="left|top"
+ height="18"
+ image_name="Move_Walk_Off"
+ layout="topleft"
+ name="avatar_icon"
+ mouse_opaque="false"
+ visible="true"
+ width="18"
+ top_pad="2"
+ left="30" />
+ <check_box
+ control_name="FirstPersonAvatarVisible"
+ follows="left|top"
+ height="20"
+ label="Show me in Mouselook"
+ layout="topleft"
+ left_pad="30"
+ name="first_person_avatar_visible"
+ width="256" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_delta="3"
+ name=" Mouse Sensitivity"
+ top_pad="10"
+ width="160">
+ Mouselook mouse sensitivity:
+ </text>
+ <slider
+ control_name="MouseSensitivity"
+ follows="left|top"
+ height="15"
+ initial_value="2"
+ layout="topleft"
+ show_text="false"
+ left_pad="5"
+ max_val="15"
+ name="mouse_sensitivity"
+ top_delta="-1"
+ width="145" />
+ <check_box
+ control_name="InvertMouse"
+ height="16"
+ label="Invert"
+ layout="topleft"
+ left_pad="2"
+ name="invert_mouse"
+ top_delta="0"
+ width="128" />
+ <check_box
+ control_name="ArrowKeysAlwaysMove"
+ follows="left|top"
+ height="20"
+ label="Arrow keys always move me"
+ layout="topleft"
+ left="78"
+ name="arrow_keys_move_avatar_check"
+ width="237"
+ top_pad="1"/>
+ <check_box
+ control_name="AllowTapTapHoldRun"
+ follows="left|top"
+ height="20"
+ label="Tap-tap-hold to run"
+ layout="topleft"
+ left_delta="0"
+ name="tap_tap_hold_to_run"
+ width="237"
+ top_pad="0"/>
+ <check_box
+ follows="left|top"
+ height="20"
+ label="Double-Click to:"
+ layout="topleft"
+ left_delta="0"
+ name="double_click_chkbox"
+ width="237"
+ top_pad="0"/>
+ <radio_group
+ height="20"
+ layout="topleft"
+ left_delta="17"
+ top_pad="2"
+ name="double_click_action">
+ <radio_item
+ height="16"
+ label="Teleport"
+ layout="topleft"
+ left="0"
+ name="radio_teleport"
+ top_delta="20"
+ value="0"
+ width="100" />
+ <radio_item
+ height="16"
+ label="Auto-pilot"
+ left_pad="0"
+ layout="topleft"
+ name="radio_autopilot"
+ top_delta="0"
+ value="1"
+ width="75" />
+ </radio_group>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 4ebd4c76f8..b396eba0b4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -47,7 +47,7 @@
layout="topleft"
left="30"
name="online_visibility"
- top_pad="20"
+ top_pad="30"
width="350" />
<check_box
enabled_control="EnableVoiceChat"
@@ -78,9 +78,9 @@
left="30"
mouse_opaque="false"
name="Logs:"
- top_pad="10"
+ top_pad="30"
width="350">
- Logs:
+ Chat Logs:
</text>
<check_box
enabled="false"
@@ -108,12 +108,21 @@
control_name="LogTimestamp"
enabled="false"
height="16"
- label="Add timestamp"
+ label="Add timestamp to each line in chat log"
layout="topleft"
left_delta="0"
name="show_timestamps_check_im"
top_pad="10"
width="237" />
+ <check_box
+ enabled="false"
+ height="16"
+ label="Add datestamp to log file name"
+ layout="topleft"
+ left_delta="0"
+ name="show_datestamps_check_im"
+ top_pad="10"
+ width="237" />
<text
type="string"
length="1"
@@ -123,7 +132,7 @@
left_delta="0"
mouse_opaque="false"
name="log_path_desc"
- top_pad="5"
+ top_pad="30"
width="128">
Location of logs:
</text>
@@ -160,11 +169,25 @@
layout="topleft"
left="30"
name="block_list"
- top_pad="20"
+ top_pad="35"
width="145">
<!--<button.commit_callback
function="SideTray.ShowPanel"-->
<button.commit_callback
function="Pref.BlockList"/>
</button>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="10"
+ layout="topleft"
+ left_pad="10"
+ mouse_opaque="false"
+ name="cache_size_label_l"
+ top_delta="3"
+ text_color="LtGray_50"
+ width="300">
+ (People and/or Objects you have blocked)
+ </text>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 140d16e37f..14aa38c5d3 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -10,51 +10,6 @@
top="1"
width="517">
<text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left="30"
- name="Mouselook:"
- top="10"
- width="300">
- Mouselook:
- </text>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_delta="50"
- name=" Mouse Sensitivity"
- top_pad="10"
- width="150">
- Mouse sensitivity
- </text>
- <slider
- control_name="MouseSensitivity"
- follows="left|top"
- height="15"
- initial_value="2"
- layout="topleft"
- show_text="false"
- left_delta="150"
- max_val="15"
- name="mouse_sensitivity"
- top_delta="0"
- width="145" />
- <check_box
- control_name="InvertMouse"
- height="16"
- label="Invert"
- layout="topleft"
- left_pad="2"
- name="invert_mouse"
- top_delta="0"
- width="128" />
- <text
type="string"
length="1"
follows="left|top"
@@ -63,7 +18,7 @@
left="30"
name="Network:"
mouse_opaque="false"
- top_pad="4"
+ top="10"
width="300">
Network:
</text>
@@ -187,7 +142,7 @@
layout="topleft"
left="80"
name="Cache location"
- top_delta="20"
+ top_delta="40"
width="300">
Cache location:
</text>
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 aa760edad3..8ade41f587 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -9,6 +9,10 @@
name="Preference Media panel"
top="1"
width="517">
+ <panel.string
+ name="middle_mouse">
+ Middle Mouse
+ </panel.string>
<slider
control_name="AudioLevelMaster"
follows="left|top"
@@ -66,7 +70,7 @@
name="UI Volume"
show_text="false"
slider_label.halign="right"
- top_pad="7"
+ top_pad="5"
volume="true"
width="300">
<slider.commit_callback
@@ -100,7 +104,7 @@
name="Wind Volume"
show_text="false"
slider_label.halign="right"
- top_pad="7"
+ top_pad="5"
volume="true"
width="300">
<slider.commit_callback
@@ -168,7 +172,7 @@
name="Music Volume"
slider_label.halign="right"
show_text="false"
- top_pad="7"
+ top_pad="5"
volume="true"
width="300">
<slider.commit_callback
@@ -211,7 +215,7 @@
name="Media Volume"
show_text="false"
slider_label.halign="right"
- top_pad="7"
+ top_pad="5"
volume="true"
width="300">
<slider.commit_callback
@@ -253,7 +257,7 @@
label_width="120"
layout="topleft"
left="0"
- top_delta="20"
+ top_pad="5"
name="Voice Volume"
show_text="false"
slider_label.halign="right"
@@ -307,7 +311,18 @@
height="15"
tool_tip="Uncheck this to hide media attached to other avatars nearby"
label="Play media attached to other avatars"
- left="25"/>
+ left="25"
+ width="230"/>
+ <check_box
+ control_name="LipSyncEnabled"
+ follows="left|top"
+ height="20"
+ label="Move avatar lips when speaking"
+ layout="topleft"
+ left_pad="0"
+ name="enable_lip_sync"
+ width="237"
+ top_delta="-4" />
<text
type="string"
@@ -317,8 +332,8 @@
layout="topleft"
left="25"
name="voice_chat_settings"
- width="200"
- top="210">
+ width="180"
+ top_pad="10">
Voice Chat Settings
</text>
<text
@@ -329,7 +344,7 @@
left="80"
top_delta="16"
name="Listen from"
- width="142">
+ width="102">
Listen from:
</text>
<icon
@@ -341,43 +356,96 @@
mouse_opaque="false"
visible="true"
width="18"
- left_pad="0"
+ left_pad="-4"
top_delta="-5"/>
<icon
follows="left|top"
height="18"
image_name="Move_Walk_Off"
layout="topleft"
+ left_pad="130"
name="avatar_icon"
mouse_opaque="false"
visible="true"
width="18"
- top_delta="20" />
+ top_delta="0" />
<radio_group
enabled_control="EnableVoiceChat"
control_name="VoiceEarLocation"
draw_border="false"
follows="left|top"
layout="topleft"
- left_pad="2"
+ left_delta="-128"
width="221"
- height="38"
+ height="20"
name="ear_location">
<radio_item
- height="16"
+ height="19"
label="Camera position"
follows="left|top"
layout="topleft"
name="0"
width="200"/>
<radio_item
- height="16"
+ height="19"
follows="left|top"
label="Avatar position"
layout="topleft"
+ left_pad="-54"
name="1"
+ top_delta ="0"
width="200" />
</radio_group>
+ <check_box
+ follows="top|left"
+ enabled_control="EnableVoiceChat"
+ control_name="PushToTalkToggle"
+ height="15"
+ label="Toggle speak on/off when I press:"
+ layout="topleft"
+ left="30"
+ name="push_to_talk_toggle_check"
+ width="237"
+ tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/>
+ <line_editor
+ follows="top|left"
+ control_name="PushToTalkButton"
+ enabled="false"
+ enabled_control="EnableVoiceChat"
+ height="23"
+ left="80"
+ max_length_bytes="200"
+ name="modifier_combo"
+ label="Push-to-Speak trigger"
+ top_pad="3"
+ width="200" />
+ <button
+ layout="topleft"
+ follows="top|left"
+ enabled_control="EnableVoiceChat"
+ height="23"
+ label="Set Key"
+ left_pad="5"
+ name="set_voice_hotkey_button"
+ width="100">
+ <button.commit_callback
+ function="Pref.VoiceSetKey" />
+ </button>
+ <button
+ enabled_control="EnableVoiceChat"
+ follows="top|left"
+ halign="center"
+ height="23"
+ image_overlay="Refresh_Off"
+ layout="topleft"
+ tool_tip="Reset to Middle Mouse Button"
+ mouse_opaque="true"
+ name="set_voice_middlemouse_button"
+ left_pad="5"
+ width="25">
+ <button.commit_callback
+ function="Pref.VoiceSetMiddleMouse" />
+ </button>
<button
control_name="ShowDeviceSettings"
follows="left|top"
@@ -385,8 +453,8 @@
is_toggle="true"
label="Input/Output devices"
layout="topleft"
- left="80"
- top_pad="5"
+ left="20"
+ top_pad="8"
name="device_settings_btn"
width="190">
</button>
@@ -396,14 +464,14 @@
visiblity_control="ShowDeviceSettings"
border="false"
follows="top|left"
- height="120"
+ height="100"
label="Device Settings"
layout="topleft"
- left="0"
+ left_delta="-2"
name="device_settings_panel"
class="panel_voice_device_settings"
- width="501"
- top="285">
+ width="470"
+ top_pad="0">
<panel.string
name="default_text">
Default
@@ -419,7 +487,7 @@
<icon
height="18"
image_name="Microphone_On"
- left="80"
+ left_delta="4"
name="microphone_icon"
mouse_opaque="false"
top="7"
@@ -434,17 +502,17 @@
layout="topleft"
left_pad="3"
name="Input"
- width="200">
+ width="70">
Input
</text>
<combo_box
height="23"
control_name="VoiceInputAudioDevice"
layout="topleft"
- left="165"
+ left_pad="0"
max_chars="128"
name="voice_input_device"
- top_pad="-2"
+ top_delta="-5"
width="200" />
<text
type="string"
@@ -452,9 +520,9 @@
follows="left|top"
height="16"
layout="topleft"
- left="165"
+ left_delta="-70"
name="My volume label"
- top_pad="5"
+ top_pad="4"
width="200">
My volume:
</text>
@@ -465,11 +533,11 @@
increment="0.025"
initial_value="1.0"
layout="topleft"
- left="160"
+ left_delta="-6"
max_val="2"
name="mic_volume_slider"
tool_tip="Change the volume using this slider"
- top_pad="-2"
+ top_pad="-1"
width="220" />
<text
type="string"
@@ -480,7 +548,7 @@
layout="topleft"
left_pad="5"
name="wait_text"
- top_delta="0"
+ top_delta="-1"
width="110">
Please wait
</text>
@@ -489,7 +557,7 @@
layout="topleft"
left_delta="0"
name="bar0"
- top_delta="0"
+ top_delta="-2"
width="20" />
<locate
height="20"
@@ -522,10 +590,10 @@
<icon
height="18"
image_name="Parcel_Voice_Light"
- left="80"
+ left="5"
name="speaker_icon"
mouse_opaque="false"
- top_pad="-8"
+ top_pad="3"
visible="true"
width="22" />
<text
@@ -537,17 +605,17 @@
layout="topleft"
left_pad="0"
name="Output"
- width="200">
+ width="70">
Output
</text>
<combo_box
control_name="VoiceOutputAudioDevice"
height="23"
layout="topleft"
- left="165"
+ left_pad="0"
max_chars="128"
name="voice_output_device"
- top_pad="-2"
+ top_delta="-3"
width="200" />
</panel>
</panel>