livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with viewer-development

meow-7.2.2
eli 2011-09-30 13:18:49 -07:00
parent 503c8ab789
commit 71362ea705
4 changed files with 114 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/skins/default/xui/en/floater_about.xml
View File

@ -23,7 +23,7 @@ Built with [COMPILER] version [COMPILER_VERSION]
name="AboutPosition">
You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP])
[SERVER_VERSION]
[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
[SERVER_RELEASE_NOTES_URL]
</floater.string>
<!-- *NOTE: Do not translate text like GPU, Graphics Card, etc -
@ -58,6 +58,10 @@ Voice Server Version: [VOICE_VERSION]
<floater.string
name="AboutTraffic">
Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
</floater.string>
<floater.string
name="ErrorFetchingServerReleaseNotesURL">
Error fetching server release notes URL.
</floater.string>
<tab_container
follows="all"

162
indra/newview/skins/default/xui/en/panel_preferences_move.xml
View File

@ -105,16 +105,61 @@
mouse_opaque="false"
visible="true"
width="18"
top_pad="2"
top_pad="10"
left="30" />
<text
follows="left|top"
type="string"
length="1"
height="10"
layout="topleft"
left="78"
name="keyboard_lbl"
width="270"
top_delta="2">
Keyboard:
</text>
<check_box
control_name="ArrowKeysAlwaysMove"
follows="left|top"
height="20"
label="Arrow keys always move me"
layout="topleft"
left_delta="5"
name="arrow_keys_move_avatar_check"
width="237"
top_pad="5"/>
<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"/>
<text
follows="left|top"
type="string"
length="1"
height="10"
layout="topleft"
left="78"
name="mouse_lbl"
width="270"
top_pad="15">
Mouse:
</text>
<check_box
control_name="FirstPersonAvatarVisible"
follows="left|top"
height="20"
label="Show me in Mouselook"
layout="topleft"
left_pad="30"
left_delta="5"
name="first_person_avatar_visible"
top_pad="5"
width="256" />
<text
type="string"
@ -136,7 +181,7 @@
initial_value="2"
layout="topleft"
show_text="false"
left_pad="5"
left_pad="0"
max_val="15"
name="mouse_sensitivity"
top_delta="-1"
@ -150,63 +195,70 @@
name="invert_mouse"
top_delta="0"
width="128" />
<check_box
control_name="ArrowKeysAlwaysMove"
<text
follows="left|top"
height="20"
label="Arrow keys always move me"
type="string"
length="1"
height="10"
layout="topleft"
left="78"
name="arrow_keys_move_avatar_check"
width="237"
top_pad="10"/>
<check_box
control_name="AllowTapTapHoldRun"
left="86"
name="single_click_action_lbl"
width="150"
top_pad="20">
Single click on land:
</text>
<combo_box
height="23"
layout="topleft"
left_pad="10"
top_delta="-6"
name="single_click_action_combo"
width="200">
<combo_box.item
label="No action"
name="0"
value="0"/>
<combo_box.item
label="Move to clicked point"
name="1"
value="1"/>
<combo_box.commit_callback
function="Pref.ClickActionChange"/>
</combo_box>
<text
follows="left|top"
height="20"
label="Tap-tap-hold to run"
type="string"
length="1"
height="10"
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:"
left="86"
name="double_click_action_lbl"
width="150"
top_pad="12">
Double click on land:
</text>
<combo_box
height="23"
layout="topleft"
left_delta="0"
name="double_click_chkbox"
width="237"
top_pad="0">
<check_box.commit_callback
function="Pref.CommitDoubleClickChekbox"/>
</check_box>
<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"
width="110" />
<radio_item
height="16"
label="Auto-pilot"
left_pad="0"
layout="topleft"
name="radio_autopilot"
top_delta="0"
width="75" />
<radio_group.commit_callback
function="Pref.CommitRadioDoubleClick"/>
</radio_group>
left_pad="10"
top_delta="-6"
name="double_click_action_combo"
width="200">
<combo_box.item
label="No action"
name="0"
value="0"/>
<combo_box.item
label="Move to clicked point"
name="1"
value="1"/>
<combo_box.item
label="Teleport to clicked point"
name="2"
value="2"/>
<combo_box.commit_callback
function="Pref.ClickActionChange"/>
</combo_box>
<button
height="23"
label="Other Devices"

2
indra/newview/skins/default/xui/en/sidepanel_task_info.xml
View File

@ -55,7 +55,7 @@
Mixed Sale
</panel.string>
<button
follows="top|right"
follows="top|left"
height="24"
image_hover_unselected="BackButton_Over"
image_pressed="BackButton_Press"

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -3439,7 +3439,7 @@ Abuse Report</string>
<string name="Female - Stick tougue out">Female - Stick tougue out</string>
<string name="Female - Wow">Female - Wow</string>
<string name="/bow1">/bow1</string>
<string name="/bow">/bow</string>
<string name="/clap">/clap</string>
<string name="/count">/count</string>
<string name="/extinguish">/extinguish</string>