diff options
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
27 files changed, 851 insertions, 851 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml index 69543b0..c74da2f 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml | |||
@@ -1,29 +1,29 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" | 2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" |
3 | height="300" min_height="200" min_width="180" name="active_speakers" | 3 | height="300" min_height="200" min_width="180" name="active_speakers" |
4 | rect_control="FloaterActiveSpeakersRect" title="Active Speakers" | 4 | rect_control="FloaterActiveSpeakersRect" title="Active Speakers" |
5 | width="250"> | 5 | width="250"> |
6 | <panel bottom="0" follows="left|top|right|bottom" left="0" mouse_opaque="false" | 6 | <panel bottom="0" follows="left|top|right|bottom" left="0" mouse_opaque="false" |
7 | name="active_speakers_panel" right="250" top="300"> | 7 | name="active_speakers_panel" right="250" top="300"> |
8 | <scroll_list bottom="35" can_resize="true" column_padding="0" draw_heading="true" | 8 | <scroll_list bottom="35" can_resize="true" column_padding="0" draw_heading="true" |
9 | draw_stripes="false" follows="left|top|bottom|right" left="10" | 9 | draw_stripes="false" follows="left|top|bottom|right" left="10" |
10 | multi_select="false" name="speakers_list" right="-10" search_column="1" | 10 | multi_select="false" name="speakers_list" right="-10" search_column="1" |
11 | sort_column="2" top="-20"> | 11 | sort_column="2" top="-20"> |
12 | <column name="icon_speaking_status" sort="speaking_status" width="20" /> | 12 | <column name="icon_speaking_status" sort="speaking_status" width="20" /> |
13 | <column dynamicwidth="true" label="Name" name="speaker_name" /> | 13 | <column dynamicwidth="true" label="Name" name="speaker_name" /> |
14 | <column label="" name="speaking_status" width="0" /> | 14 | <column label="" name="speaking_status" width="0" /> |
15 | </scroll_list> | 15 | </scroll_list> |
16 | <panel background_opaque="false" background_visible="false" bevel_style="in" | 16 | <panel background_opaque="false" background_visible="false" bevel_style="in" |
17 | bg_alpha_color="0,0,0,0" bg_opaque_color="0,0,0,0.3" border="false" | 17 | bg_alpha_color="0,0,0,0" bg_opaque_color="0,0,0,0.3" border="false" |
18 | bottom="5" can_resize="false" follows="left|right|bottom" height="20" | 18 | bottom="5" can_resize="false" follows="left|right|bottom" height="20" |
19 | left="10" mouse_opaque="true" name="volume_container" right="-10"> | 19 | left="10" mouse_opaque="true" name="volume_container" right="-10"> |
20 | <volume_slider bottom="5" follows="left|bottom" height="15" increment="0.05" initial_val="0.5" | 20 | <volume_slider bottom="5" follows="left|bottom" height="15" increment="0.05" initial_val="0.5" |
21 | left_delta="10" max_val="1.0" min_val="0.0" name="speaker_volume" | 21 | left_delta="10" max_val="1.0" min_val="0.0" name="speaker_volume" |
22 | width="110" /> | 22 | width="110" /> |
23 | <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" | 23 | <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" |
24 | image_unselected="icn_speaker_dark.tga" label="" left_delta="115" | 24 | image_unselected="icn_speaker_dark.tga" label="" left_delta="115" |
25 | name="mute_btn" toggle="true" tool_tip="Mute voice for this resident" | 25 | name="mute_btn" toggle="true" tool_tip="Mute voice for this resident" |
26 | width="25" /> | 26 | width="25" /> |
27 | </panel> | 27 | </panel> |
28 | </panel> | 28 | </panel> |
29 | </floater> | 29 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml index ea555c0..69f8286 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml | |||
@@ -1,12 +1,12 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" | 2 | <multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" |
3 | height="390" name="floater_chatterbox" | 3 | height="390" name="floater_chatterbox" |
4 | rect_control="ChatterboxRect" title="Communicate" width="392"> | 4 | rect_control="ChatterboxRect" title="Communicate" width="392"> |
5 | <icon enabled="false" image_name="tabarea.tga" | 5 | <icon enabled="false" image_name="tabarea.tga" |
6 | bg_alpha_color="blue" color="DefaultShadowLight" border="false" | 6 | bg_alpha_color="blue" color="DefaultShadowLight" border="false" |
7 | bottom="-388" follows="left|right|bottom" height="17" left="1" scale_image="true" | 7 | bottom="-388" follows="left|right|bottom" height="17" left="1" scale_image="true" |
8 | mouse_opaque="false" name="chatterbox_tab_container" width="391"></icon> | 8 | mouse_opaque="false" name="chatterbox_tab_container" width="391"></icon> |
9 | <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0" | 9 | <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0" |
10 | name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" /> | 10 | name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" /> |
11 | </multi_floater> | 11 | </multi_floater> |
12 | 12 | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_device_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_device_settings.xml index 6c27707..90f8539 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_device_settings.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_device_settings.xml | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater bottom="0" can_drag_on_left="false" can_minimize="true" can_resize="false" | 2 | <floater bottom="0" can_drag_on_left="false" can_minimize="true" can_resize="false" |
3 | height="260" left="0" name="floater_device_settings" | 3 | height="260" left="0" name="floater_device_settings" |
4 | title="Voice Chat Device Settings" width="405"> | 4 | title="Voice Chat Device Settings" width="405"> |
5 | <panel bottom="0" filename="panel_audio_device.xml" left="2" name="device_settings" | 5 | <panel bottom="0" filename="panel_audio_device.xml" left="2" name="device_settings" |
6 | right="-5" top="-20" /> | 6 | right="-5" top="-20" /> |
7 | </floater> | 7 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml index 84d113a..6cc501b 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_hud.xml | |||
@@ -1,12 +1,12 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false" | 2 | <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false" |
3 | height="292" width="362" name="floater_hud" | 3 | height="292" width="362" name="floater_hud" |
4 | title="Tutorial"> | 4 | title="Tutorial"> |
5 | <!-- NOTE: Height and width must match values in settings.xml for | 5 | <!-- NOTE: Height and width must match values in settings.xml for |
6 | FloaterHUDRect because this floater is resized to those values | 6 | FloaterHUDRect because this floater is resized to those values |
7 | in LLViewerWindow initialization. JC --> | 7 | in LLViewerWindow initialization. JC --> |
8 | <web_browser border_visible="false" left="1" bottom="1" width="360" height="265" caret_color="1 1 1 1" follows="top|left|bottom|right" | 8 | <web_browser border_visible="false" left="1" bottom="1" width="360" height="265" caret_color="1 1 1 1" follows="top|left|bottom|right" |
9 | name="floater_hud_browser" | 9 | name="floater_hud_browser" |
10 | start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E" | 10 | start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E" |
11 | /> | 11 | /> |
12 | </floater> | 12 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml index 11f6db3..fbb1133 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml | |||
@@ -1,24 +1,24 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" | 2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" |
3 | min_height="300" min_width="400" name="inspect" | 3 | min_height="300" min_width="400" name="inspect" |
4 | rect_control="FloaterInspectRect" title="Inspect Objects"> | 4 | rect_control="FloaterInspectRect" title="Inspect Objects"> |
5 | <scroll_list bottom="30" can_resize="false" column_padding="0" draw_heading="true" | 5 | <scroll_list bottom="30" can_resize="false" column_padding="0" draw_heading="true" |
6 | follows="top|right|left|bottom" left="10" multi_select="false" | 6 | follows="top|right|left|bottom" left="10" multi_select="false" |
7 | name="object_list" right="-10" | 7 | name="object_list" right="-10" |
8 | tool_tip="Select an object from this list to highlight it in-world" | 8 | tool_tip="Select an object from this list to highlight it in-world" |
9 | top="-20"> | 9 | top="-20"> |
10 | <column dynamicwidth="true" label="Object Name" name="object_name" /> | 10 | <column dynamicwidth="true" label="Object Name" name="object_name" /> |
11 | <column dynamicwidth="true" label="Owner Name" name="owner_name" /> | 11 | <column dynamicwidth="true" label="Owner Name" name="owner_name" /> |
12 | <column dynamicwidth="true" label="Creator Name" name="creator_name" /> | 12 | <column dynamicwidth="true" label="Creator Name" name="creator_name" /> |
13 | <column label="Creation Date" name="creation_date" width="150" /> | 13 | <column label="Creation Date" name="creation_date" width="150" /> |
14 | </scroll_list> | 14 | </scroll_list> |
15 | <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20" | 15 | <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20" |
16 | label="See Owner Profile..." label_selected="" left="10" | 16 | label="See Owner Profile..." label_selected="" left="10" |
17 | mouse_opaque="true" name="button owner" | 17 | mouse_opaque="true" name="button owner" |
18 | tool_tip="See profile of the highlighted object's owner" width="150" /> | 18 | tool_tip="See profile of the highlighted object's owner" width="150" /> |
19 | <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20" | 19 | <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20" |
20 | label="See Creator Profile..." label_selected="" left="170" | 20 | label="See Creator Profile..." label_selected="" left="170" |
21 | mouse_opaque="true" name="button creator" | 21 | mouse_opaque="true" name="button creator" |
22 | tool_tip="See profile of the highlighted object's original creator" | 22 | tool_tip="See profile of the highlighted object's original creator" |
23 | width="150" /> | 23 | width="150" /> |
24 | </floater> | 24 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml index 7b2c6b6..08c6b53 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml | |||
@@ -1,200 +1,200 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" | 2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" |
3 | can_resize="false" height="150" name="floater_lagmeter" | 3 | can_resize="false" height="150" name="floater_lagmeter" |
4 | rect_control="FloaterLagMeter" title="Lag Meter" width="350"> | 4 | rect_control="FloaterLagMeter" title="Lag Meter" width="350"> |
5 | <button bottom="-40" enabled="true" follows="top|left" font="SansSerif" halign="center" | 5 | <button bottom="-40" enabled="true" follows="top|left" font="SansSerif" halign="center" |
6 | height="16" image_selected="lag_status_good.tga" | 6 | height="16" image_selected="lag_status_good.tga" |
7 | image_unselected="lag_status_good.tga" label="" label_selected="" left="8" | 7 | image_unselected="lag_status_good.tga" label="" label_selected="" left="8" |
8 | mouse_opaque="true" name="client_lagmeter" scale_image="true" | 8 | mouse_opaque="true" name="client_lagmeter" scale_image="true" |
9 | tab_stop="false" tool_tip="Client lag status" width="16" /> | 9 | tab_stop="false" tool_tip="Client lag status" width="16" /> |
10 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 10 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
11 | bottom="-40" drop_shadow_visible="true" follows="left|top" font="SansSerif" | 11 | bottom="-40" drop_shadow_visible="true" follows="left|top" font="SansSerif" |
12 | h_pad="0" halign="left" height="16" left="27" mouse_opaque="true" | 12 | h_pad="0" halign="left" height="16" left="27" mouse_opaque="true" |
13 | name="client" v_pad="0" width="128"> | 13 | name="client" v_pad="0" width="128"> |
14 | Client: | 14 | Client: |
15 | </text> | 15 | </text> |
16 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 16 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
17 | bottom="-40" drop_shadow_visible="true" follows="left|top" font="SansSerif" | 17 | bottom="-40" drop_shadow_visible="true" follows="left|top" font="SansSerif" |
18 | h_pad="0" halign="left" height="16" left="110" mouse_opaque="true" | 18 | h_pad="0" halign="left" height="16" left="110" mouse_opaque="true" |
19 | name="client_text" right="-10" v_pad="0"> | 19 | name="client_text" right="-10" v_pad="0"> |
20 | Normal | 20 | Normal |
21 | </text> | 21 | </text> |
22 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 22 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
23 | bottom="-56" drop_shadow_visible="true" follows="left|top" | 23 | bottom="-56" drop_shadow_visible="true" follows="left|top" |
24 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40" | 24 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40" |
25 | mouse_opaque="true" name="client_lag_cause" right="-32" v_pad="0" /> | 25 | mouse_opaque="true" name="client_lag_cause" right="-32" v_pad="0" /> |
26 | <button bottom="-80" enabled="true" follows="top|left" font="SansSerif" halign="center" | 26 | <button bottom="-80" enabled="true" follows="top|left" font="SansSerif" halign="center" |
27 | height="16" image_selected="lag_status_good.tga" | 27 | height="16" image_selected="lag_status_good.tga" |
28 | image_unselected="lag_status_good.tga" label="" label_selected="" left="8" | 28 | image_unselected="lag_status_good.tga" label="" label_selected="" left="8" |
29 | mouse_opaque="true" name="network_lagmeter" scale_image="true" | 29 | mouse_opaque="true" name="network_lagmeter" scale_image="true" |
30 | tab_stop="false" tool_tip="Network lag status" width="16" /> | 30 | tab_stop="false" tool_tip="Network lag status" width="16" /> |
31 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 31 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
32 | bottom="-80" drop_shadow_visible="true" follows="left|top" font="SansSerif" | 32 | bottom="-80" drop_shadow_visible="true" follows="left|top" font="SansSerif" |
33 | h_pad="0" halign="left" height="16" left="27" mouse_opaque="true" | 33 | h_pad="0" halign="left" height="16" left="27" mouse_opaque="true" |
34 | name="network" v_pad="0" width="128"> | 34 | name="network" v_pad="0" width="128"> |
35 | Network: | 35 | Network: |
36 | </text> | 36 | </text> |
37 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 37 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
38 | bottom="-80" drop_shadow_visible="true" follows="left|top" font="SansSerif" | 38 | bottom="-80" drop_shadow_visible="true" follows="left|top" font="SansSerif" |
39 | h_pad="0" halign="left" height="16" left="110" mouse_opaque="true" | 39 | h_pad="0" halign="left" height="16" left="110" mouse_opaque="true" |
40 | name="network_text" right="-10" v_pad="0"> | 40 | name="network_text" right="-10" v_pad="0"> |
41 | Normal | 41 | Normal |
42 | </text> | 42 | </text> |
43 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 43 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
44 | bottom="-96" drop_shadow_visible="true" follows="left|top" | 44 | bottom="-96" drop_shadow_visible="true" follows="left|top" |
45 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40" | 45 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40" |
46 | mouse_opaque="true" name="network_lag_cause" right="-32" v_pad="0" /> | 46 | mouse_opaque="true" name="network_lag_cause" right="-32" v_pad="0" /> |
47 | <button bottom="-120" enabled="true" follows="top|left" font="SansSerif" | 47 | <button bottom="-120" enabled="true" follows="top|left" font="SansSerif" |
48 | halign="center" height="16" image_selected="lag_status_good.tga" | 48 | halign="center" height="16" image_selected="lag_status_good.tga" |
49 | image_unselected="lag_status_good.tga" label="" label_selected="" left="8" | 49 | image_unselected="lag_status_good.tga" label="" label_selected="" left="8" |
50 | mouse_opaque="true" name="server_lagmeter" scale_image="true" | 50 | mouse_opaque="true" name="server_lagmeter" scale_image="true" |
51 | tab_stop="false" tool_tip="Server lag status" width="16" /> | 51 | tab_stop="false" tool_tip="Server lag status" width="16" /> |
52 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 52 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
53 | bottom="-120" drop_shadow_visible="true" follows="left|top" | 53 | bottom="-120" drop_shadow_visible="true" follows="left|top" |
54 | font="SansSerif" h_pad="0" halign="left" height="16" left="27" | 54 | font="SansSerif" h_pad="0" halign="left" height="16" left="27" |
55 | mouse_opaque="true" name="server" v_pad="0" width="60"> | 55 | mouse_opaque="true" name="server" v_pad="0" width="60"> |
56 | Server: | 56 | Server: |
57 | </text> | 57 | </text> |
58 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 58 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
59 | bottom="-120" drop_shadow_visible="true" follows="left|top" | 59 | bottom="-120" drop_shadow_visible="true" follows="left|top" |
60 | font="SansSerif" h_pad="0" halign="left" height="16" left="85" | 60 | font="SansSerif" h_pad="0" halign="left" height="16" left="85" |
61 | mouse_opaque="true" name="server_text" right="-10" v_pad="0"> | 61 | mouse_opaque="true" name="server_text" right="-10" v_pad="0"> |
62 | Normal | 62 | Normal |
63 | </text> | 63 | </text> |
64 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 64 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
65 | bottom="-136" drop_shadow_visible="true" follows="left|top" | 65 | bottom="-136" drop_shadow_visible="true" follows="left|top" |
66 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40" | 66 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40" |
67 | mouse_opaque="true" name="server_lag_cause" right="-32" v_pad="0" /> | 67 | mouse_opaque="true" name="server_lag_cause" right="-32" v_pad="0" /> |
68 | <button bottom="5" follows="left|top" font="SansSerif" halign="center" height="18" | 68 | <button bottom="5" follows="left|top" font="SansSerif" halign="center" height="18" |
69 | help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=4851" | 69 | help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=4851" |
70 | label="?" mouse_opaque="true" | 70 | label="?" mouse_opaque="true" |
71 | name="server_help" right="-10" width="18" /> | 71 | name="server_help" right="-10" width="18" /> |
72 | <button bottom="5" follows="left|top" font="SansSerif" halign="center" height="20" | 72 | <button bottom="5" follows="left|top" font="SansSerif" halign="center" height="20" |
73 | label=">>" left="5" mouse_opaque="true" name="minimize" width="25" /> | 73 | label=">>" left="5" mouse_opaque="true" name="minimize" width="25" /> |
74 | <string name="max_title_msg"> | 74 | <string name="max_title_msg"> |
75 | Lag Meter | 75 | Lag Meter |
76 | </string> | 76 | </string> |
77 | <string name="max_width_px"> | 77 | <string name="max_width_px"> |
78 | 360 | 78 | 360 |
79 | </string> | 79 | </string> |
80 | <string name="min_title_msg"> | 80 | <string name="min_title_msg"> |
81 | Lag | 81 | Lag |
82 | </string> | 82 | </string> |
83 | <string name="min_width_px"> | 83 | <string name="min_width_px"> |
84 | 90 | 84 | 90 |
85 | </string> | 85 | </string> |
86 | <string name="client_text_msg"> | 86 | <string name="client_text_msg"> |
87 | Client | 87 | Client |
88 | </string> | 88 | </string> |
89 | <string name="client_frame_rate_critical_fps"> | 89 | <string name="client_frame_rate_critical_fps"> |
90 | 10 | 90 | 10 |
91 | </string> | 91 | </string> |
92 | <string name="client_frame_rate_warning_fps"> | 92 | <string name="client_frame_rate_warning_fps"> |
93 | 15 | 93 | 15 |
94 | </string> | 94 | </string> |
95 | <string name="client_frame_time_window_bg_msg"> | 95 | <string name="client_frame_time_window_bg_msg"> |
96 | Normal, window in background | 96 | Normal, window in background |
97 | </string> | 97 | </string> |
98 | <string name="client_frame_time_critical_msg"> | 98 | <string name="client_frame_time_critical_msg"> |
99 | Client frame rate below [CLIENT_FRAME_RATE_CRITICAL] | 99 | Client frame rate below [CLIENT_FRAME_RATE_CRITICAL] |
100 | </string> | 100 | </string> |
101 | <string name="client_frame_time_warning_msg"> | 101 | <string name="client_frame_time_warning_msg"> |
102 | Client frame rate between [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING] | 102 | Client frame rate between [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING] |
103 | </string> | 103 | </string> |
104 | <string name="client_frame_time_normal_msg"> | 104 | <string name="client_frame_time_normal_msg"> |
105 | Normal | 105 | Normal |
106 | </string> | 106 | </string> |
107 | <string name="client_draw_distance_cause_msg"> | 107 | <string name="client_draw_distance_cause_msg"> |
108 | Possible cause: Draw distance set too high | 108 | Possible cause: Draw distance set too high |
109 | </string> | 109 | </string> |
110 | <string name="client_texture_loading_cause_msg"> | 110 | <string name="client_texture_loading_cause_msg"> |
111 | Possible cause: Images loading | 111 | Possible cause: Images loading |
112 | </string> | 112 | </string> |
113 | <string name="client_texture_memory_cause_msg"> | 113 | <string name="client_texture_memory_cause_msg"> |
114 | Possible cause: Too many images in memory | 114 | Possible cause: Too many images in memory |
115 | </string> | 115 | </string> |
116 | <string name="client_complex_objects_cause_msg"> | 116 | <string name="client_complex_objects_cause_msg"> |
117 | Possible cause: Too many complex objects in scene | 117 | Possible cause: Too many complex objects in scene |
118 | </string> | 118 | </string> |
119 | <string name="network_text_msg"> | 119 | <string name="network_text_msg"> |
120 | Network | 120 | Network |
121 | </string> | 121 | </string> |
122 | <string name="network_packet_loss_critical_pct"> | 122 | <string name="network_packet_loss_critical_pct"> |
123 | 10 | 123 | 10 |
124 | </string> | 124 | </string> |
125 | <string name="network_packet_loss_warning_pct"> | 125 | <string name="network_packet_loss_warning_pct"> |
126 | 5 | 126 | 5 |
127 | </string> | 127 | </string> |
128 | <string name="network_packet_loss_critical_msg"> | 128 | <string name="network_packet_loss_critical_msg"> |
129 | Connection is dropping over [NETWORK_PACKET_LOSS_CRITICAL]% of packets | 129 | Connection is dropping over [NETWORK_PACKET_LOSS_CRITICAL]% of packets |
130 | </string> | 130 | </string> |
131 | <string name="network_packet_loss_warning_msg"> | 131 | <string name="network_packet_loss_warning_msg"> |
132 | Connection is dropping [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% of packets | 132 | Connection is dropping [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% of packets |
133 | </string> | 133 | </string> |
134 | <string name="network_performance_normal_msg"> | 134 | <string name="network_performance_normal_msg"> |
135 | Normal | 135 | Normal |
136 | </string> | 136 | </string> |
137 | <string name="network_ping_critical_ms"> | 137 | <string name="network_ping_critical_ms"> |
138 | 600 | 138 | 600 |
139 | </string> | 139 | </string> |
140 | <string name="network_ping_warning_ms"> | 140 | <string name="network_ping_warning_ms"> |
141 | 300 | 141 | 300 |
142 | </string> | 142 | </string> |
143 | <string name="network_ping_critical_msg"> | 143 | <string name="network_ping_critical_msg"> |
144 | Connection ping time is over [NETWORK_PING_CRITICAL] ms | 144 | Connection ping time is over [NETWORK_PING_CRITICAL] ms |
145 | </string> | 145 | </string> |
146 | <string name="network_ping_warning_msg"> | 146 | <string name="network_ping_warning_msg"> |
147 | Connection ping time is [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms | 147 | Connection ping time is [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms |
148 | </string> | 148 | </string> |
149 | <string name="network_packet_loss_cause_msg"> | 149 | <string name="network_packet_loss_cause_msg"> |
150 | Possible bad connection or 'Bandwidth' pref too high. | 150 | Possible bad connection or 'Bandwidth' pref too high. |
151 | </string> | 151 | </string> |
152 | <string name="network_ping_cause_msg"> | 152 | <string name="network_ping_cause_msg"> |
153 | Possible bad connection or file-sharing app. | 153 | Possible bad connection or file-sharing app. |
154 | </string> | 154 | </string> |
155 | <string name="server_text_msg"> | 155 | <string name="server_text_msg"> |
156 | Server | 156 | Server |
157 | </string> | 157 | </string> |
158 | <string name="server_frame_rate_critical_fps"> | 158 | <string name="server_frame_rate_critical_fps"> |
159 | 20 | 159 | 20 |
160 | </string> | 160 | </string> |
161 | <string name="server_frame_rate_warning_fps"> | 161 | <string name="server_frame_rate_warning_fps"> |
162 | 30 | 162 | 30 |
163 | </string> | 163 | </string> |
164 | <string name="server_single_process_max_time_ms"> | 164 | <string name="server_single_process_max_time_ms"> |
165 | 20 | 165 | 20 |
166 | </string> | 166 | </string> |
167 | <string name="server_frame_time_critical_msg"> | 167 | <string name="server_frame_time_critical_msg"> |
168 | Simulator framerate below [SERVER_FRAME_RATE_CRITICAL] | 168 | Simulator framerate below [SERVER_FRAME_RATE_CRITICAL] |
169 | </string> | 169 | </string> |
170 | <string name="server_frame_time_warning_msg"> | 170 | <string name="server_frame_time_warning_msg"> |
171 | Simulator framerate between [SERVER_FRAME_RATE_CRITICAL] and [SERVER_FRAME_RATE_WARNING] | 171 | Simulator framerate between [SERVER_FRAME_RATE_CRITICAL] and [SERVER_FRAME_RATE_WARNING] |
172 | </string> | 172 | </string> |
173 | <string name="server_frame_time_normal_msg"> | 173 | <string name="server_frame_time_normal_msg"> |
174 | Normal | 174 | Normal |
175 | </string> | 175 | </string> |
176 | <string name="server_physics_cause_msg"> | 176 | <string name="server_physics_cause_msg"> |
177 | Possible Cause: Too many physical objects | 177 | Possible Cause: Too many physical objects |
178 | </string> | 178 | </string> |
179 | <string name="server_scripts_cause_msg"> | 179 | <string name="server_scripts_cause_msg"> |
180 | Possible Cause: Too many scripted objects | 180 | Possible Cause: Too many scripted objects |
181 | </string> | 181 | </string> |
182 | <string name="server_net_cause_msg"> | 182 | <string name="server_net_cause_msg"> |
183 | Possible Cause: Too much network traffic | 183 | Possible Cause: Too much network traffic |
184 | </string> | 184 | </string> |
185 | <string name="server_agent_cause_msg"> | 185 | <string name="server_agent_cause_msg"> |
186 | Possible Cause: Too many moving people in region | 186 | Possible Cause: Too many moving people in region |
187 | </string> | 187 | </string> |
188 | <string name="server_images_cause_msg"> | 188 | <string name="server_images_cause_msg"> |
189 | Possible Cause: Too many image calculations | 189 | Possible Cause: Too many image calculations |
190 | </string> | 190 | </string> |
191 | <string name="server_generic_cause_msg"> | 191 | <string name="server_generic_cause_msg"> |
192 | Possible Cause: Simulator load too heavy | 192 | Possible Cause: Simulator load too heavy |
193 | </string> | 193 | </string> |
194 | <string name="smaller_label"> | 194 | <string name="smaller_label"> |
195 | >> | 195 | >> |
196 | </string> | 196 | </string> |
197 | <string name="bigger_label"> | 197 | <string name="bigger_label"> |
198 | << | 198 | << |
199 | </string> | 199 | </string> |
200 | </floater> | 200 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/en-us/floater_lsl_guide.xml index 1f25c74..5a10254 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_lsl_guide.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_lsl_guide.xml | |||
@@ -1,21 +1,21 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater bottom="-500" can_close="true" can_drag_on_left="false" can_minimize="true" | 2 | <floater bottom="-500" can_close="true" can_drag_on_left="false" can_minimize="true" |
3 | can_resize="true" enabled="true" follows="left|top" height="400" left="306" | 3 | can_resize="true" enabled="true" follows="left|top" height="400" left="306" |
4 | min_height="271" min_width="350" mouse_opaque="true" name="script ed float" | 4 | min_height="271" min_width="350" mouse_opaque="true" name="script ed float" |
5 | rect_control="LSLHelpRect" title="LSL Wiki" width="370"> | 5 | rect_control="LSLHelpRect" title="LSL Wiki" width="370"> |
6 | <check_box bottom="-45" enabled="true" follows="top|left" font="SansSerif" halign="center" | 6 | <check_box bottom="-45" enabled="true" follows="top|left" font="SansSerif" halign="center" |
7 | height="20" label="Follow cursor" left="10" mouse_opaque="true" | 7 | height="20" label="Follow cursor" left="10" mouse_opaque="true" |
8 | name="lock_check" width="60" /> | 8 | name="lock_check" width="60" /> |
9 | <combo_box allow_text_entry="true" bottom_delta="0" enabled="true" | 9 | <combo_box allow_text_entry="true" bottom_delta="0" enabled="true" |
10 | follows="top|left|right" font="SansSerif" halign="center" height="20" | 10 | follows="top|left|right" font="SansSerif" halign="center" height="20" |
11 | label="Lock" left_delta="100" mouse_opaque="true" name="history_combo" | 11 | label="Lock" left_delta="100" mouse_opaque="true" name="history_combo" |
12 | width="90" /> | 12 | width="90" /> |
13 | <button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif" | 13 | <button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif" |
14 | halign="center" height="20" label="Back" left_delta="95" | 14 | halign="center" height="20" label="Back" left_delta="95" |
15 | mouse_opaque="true" name="back_btn" width="70" /> | 15 | mouse_opaque="true" name="back_btn" width="70" /> |
16 | <button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif" | 16 | <button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif" |
17 | halign="center" height="20" label="Forward" left_delta="75" | 17 | halign="center" height="20" label="Forward" left_delta="75" |
18 | mouse_opaque="true" name="fwd_btn" width="70" /> | 18 | mouse_opaque="true" name="fwd_btn" width="70" /> |
19 | <web_browser bottom="10" follows="left|right|top|bottom" left="10" name="lsl_guide_html" | 19 | <web_browser bottom="10" follows="left|right|top|bottom" left="10" name="lsl_guide_html" |
20 | right="-10" top="-50" /> | 20 | right="-10" top="-50" /> |
21 | </floater> | 21 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_my_friends.xml b/linden/indra/newview/skins/default/xui/en-us/floater_my_friends.xml index 181c7de..c5d817b 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_my_friends.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_my_friends.xml | |||
@@ -1,13 +1,13 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater can_close="false" can_drag_on_left="false" can_minimize="true" | 2 | <floater can_close="false" can_drag_on_left="false" can_minimize="true" |
3 | can_resize="true" can_tear_off="true" height="390" min_height="240" | 3 | can_resize="true" can_tear_off="true" height="390" min_height="240" |
4 | min_width="365" name="floater_my_friends" | 4 | min_width="365" name="floater_my_friends" |
5 | rect_control="FloaterContactsRect" title="Contacts" width="395"> | 5 | rect_control="FloaterContactsRect" title="Contacts" width="395"> |
6 | <tab_container bottom="6" follows="left|right|top|bottom" height="364" left="4" | 6 | <tab_container bottom="6" follows="left|right|top|bottom" height="364" left="4" |
7 | name="friends_and_groups" tab_position="top" tab_width="80" width="383"> | 7 | name="friends_and_groups" tab_position="top" tab_width="80" width="383"> |
8 | <panel bottom="0" filename="panel_friends.xml" label="Friends" left="0" | 8 | <panel bottom="0" filename="panel_friends.xml" label="Friends" left="0" |
9 | name="friends_panel" width="370" /> | 9 | name="friends_panel" width="370" /> |
10 | <panel bottom="0" filename="panel_groups.xml" label="Groups" left="0" | 10 | <panel bottom="0" filename="panel_groups.xml" label="Groups" left="0" |
11 | name="groups_panel" width="370" /> | 11 | name="groups_panel" width="370" /> |
12 | </tab_container> | 12 | </tab_container> |
13 | </floater> | 13 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_region_info.xml b/linden/indra/newview/skins/default/xui/en-us/floater_region_info.xml index b0ee0a2..38607cb 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_region_info.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_region_info.xml | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" | 2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" |
3 | can_resize="false" name="regioninfo" rect_control="FloaterRegionInfo" | 3 | can_resize="false" name="regioninfo" rect_control="FloaterRegionInfo" |
4 | title="Region/Estate"> | 4 | title="Region/Estate"> |
5 | <tab_container border="false" bottom="0" follows="left|right|top|bottom" left="1" | 5 | <tab_container border="false" bottom="0" follows="left|right|top|bottom" left="1" |
6 | name="region_panels" right="-1" tab_position="top" top="-20" /> | 6 | name="region_panels" right="-1" tab_position="top" top="-20" /> |
7 | </floater> | 7 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_select_key.xml b/linden/indra/newview/skins/default/xui/en-us/floater_select_key.xml index 0a9b7ce..e68ced2 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_select_key.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_select_key.xml | |||
@@ -1,15 +1,15 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater border="true" bottom="372" can_close="false" can_drag_on_left="false" | 2 | <floater border="true" bottom="372" can_close="false" can_drag_on_left="false" |
3 | can_minimize="false" can_resize="false" can_tear_off="true" enabled="true" | 3 | can_minimize="false" can_resize="false" can_tear_off="true" enabled="true" |
4 | height="100" left="415" min_height="100" min_width="100" | 4 | height="100" left="415" min_height="100" min_width="100" |
5 | mouse_opaque="true" name="modal container" title="" width="240"> | 5 | mouse_opaque="true" name="modal container" title="" width="240"> |
6 | <button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20" | 6 | <button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20" |
7 | label="Cancel" label_selected="Cancel" left="138" mouse_opaque="true" | 7 | label="Cancel" label_selected="Cancel" left="138" mouse_opaque="true" |
8 | name="Cancel" scale_image="true" width="82" /> | 8 | name="Cancel" scale_image="true" width="82" /> |
9 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 9 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
10 | bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top" | 10 | bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top" |
11 | font="SansSerif" h_pad="0" halign="left" height="16" left="20" | 11 | font="SansSerif" h_pad="0" halign="left" height="16" left="20" |
12 | mouse_opaque="true" name="Save item as:" v_pad="0" width="200"> | 12 | mouse_opaque="true" name="Save item as:" v_pad="0" width="200"> |
13 | Press a key to select | 13 | Press a key to select |
14 | </text> | 14 | </text> |
15 | </floater> | 15 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sim_release_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sim_release_message.xml index cbb2326..72e8b27 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_sim_release_message.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_sim_release_message.xml | |||
@@ -1,21 +1,21 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" | 2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" |
3 | height="500" min_height="300" min_width="300" name="floaterreleasemessage" | 3 | height="500" min_height="300" min_width="300" name="floaterreleasemessage" |
4 | title="Entering Region" width="700"> | 4 | title="Entering Region" width="700"> |
5 | <button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20" | 5 | <button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20" |
6 | label="Close" name="close_btn" right="-10" width="50" /> | 6 | label="Close" name="close_btn" right="-10" width="50" /> |
7 | <web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15" | 7 | <web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15" |
8 | name="release_message_floater_browser" right="-15" top="-30" /> | 8 | name="release_message_floater_browser" right="-15" top="-30" /> |
9 | <string name="in-world_help_title"> | 9 | <string name="in-world_help_title"> |
10 | In-World Help | 10 | In-World Help |
11 | </string> | 11 | </string> |
12 | <string name="in-world_help_url"> | 12 | <string name="in-world_help_url"> |
13 | http://www.secondlife.com/app/support/inworld.html | 13 | http://www.secondlife.com/app/support/inworld.html |
14 | </string> | 14 | </string> |
15 | <string name="additional_help_title"> | 15 | <string name="additional_help_title"> |
16 | Additional Help | 16 | Additional Help |
17 | </string> | 17 | </string> |
18 | <string name="additional_help_url"> | 18 | <string name="additional_help_url"> |
19 | http://www.secondlife.com/app/support/support.html | 19 | http://www.secondlife.com/app/support/support.html |
20 | </string> | 20 | </string> |
21 | </floater> | 21 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_voice_wizard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_voice_wizard.xml index 6ed2ea4..71acd0f 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_voice_wizard.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_voice_wizard.xml | |||
@@ -1,19 +1,19 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater bottom="0" can_minimize="true" can_resize="false" height="300" left="0" | 2 | <floater bottom="0" can_minimize="true" can_resize="false" height="300" left="0" |
3 | name="floater_voice_wizard" title="Voice Setup" width="420"> | 3 | name="floater_voice_wizard" title="Voice Setup" width="420"> |
4 | <tab_container bottom="30" hide_tabs="true" left="4" name="wizard_tabs" right="-2" | 4 | <tab_container bottom="30" hide_tabs="true" left="4" name="wizard_tabs" right="-2" |
5 | tab_position="bottom" top="-20"> | 5 | tab_position="bottom" top="-20"> |
6 | <panel bottom="0" filename="panel_voice_enable.xml" left="0" right="0" /> | 6 | <panel bottom="0" filename="panel_voice_enable.xml" left="0" right="0" /> |
7 | <panel bottom="0" filename="panel_voice_options.xml" left="0" right="0" /> | 7 | <panel bottom="0" filename="panel_voice_options.xml" left="0" right="0" /> |
8 | <panel bottom="0" filename="panel_audio_device.xml" left="0" name="device_settings" | 8 | <panel bottom="0" filename="panel_audio_device.xml" left="0" name="device_settings" |
9 | right="0" /> | 9 | right="0" /> |
10 | </tab_container> | 10 | </tab_container> |
11 | <panel border="false" bottom="8" height="20" left="8" mouse_opaque="true" | 11 | <panel border="false" bottom="8" height="20" left="8" mouse_opaque="true" |
12 | name="content_panel" width="404"> | 12 | name="content_panel" width="404"> |
13 | <button bottom="0" height="20" label="Previous" left="55" name="back_btn" width="85" /> | 13 | <button bottom="0" height="20" label="Previous" left="55" name="back_btn" width="85" /> |
14 | <button bottom="0" height="20" label="Next" left_delta="90" name="next_btn" width="85" /> | 14 | <button bottom="0" height="20" label="Next" left_delta="90" name="next_btn" width="85" /> |
15 | <button bottom="0" height="20" label="Finish" left_delta="90" name="ok_btn" width="85" /> | 15 | <button bottom="0" height="20" label="Finish" left_delta="90" name="ok_btn" width="85" /> |
16 | <button bottom="0" height="20" label="Cancel" left_delta="90" name="cancel_btn" | 16 | <button bottom="0" height="20" label="Cancel" left_delta="90" name="cancel_btn" |
17 | width="80" /> | 17 | width="80" /> |
18 | </panel> | 18 | </panel> |
19 | </floater> | 19 | </floater> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml index 39820e5..13f0e16 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml | |||
@@ -1,60 +1,60 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel border="false" bottom="0" enabled="true" height="240" left="8" | 2 | <panel border="false" bottom="0" enabled="true" height="240" left="8" |
3 | mouse_opaque="true" name="device_settings" width="404"> | 3 | mouse_opaque="true" name="device_settings" width="404"> |
4 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 4 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
5 | drop_shadow_visible="true" enabled="true" follows="left|top" | 5 | drop_shadow_visible="true" enabled="true" follows="left|top" |
6 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="6" | 6 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="6" |
7 | mouse_opaque="true" name="Audio Devices" v_pad="0" width="200"> | 7 | mouse_opaque="true" name="Audio Devices" v_pad="0" width="200"> |
8 | Audio Devices | 8 | Audio Devices |
9 | </text> | 9 | </text> |
10 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 10 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
11 | bottom_delta="-22" drop_shadow_visible="true" enabled="true" | 11 | bottom_delta="-22" drop_shadow_visible="true" enabled="true" |
12 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" | 12 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" |
13 | height="16" left="20" mouse_opaque="true" name="Input device (microphone):" | 13 | height="16" left="20" mouse_opaque="true" name="Input device (microphone):" |
14 | v_pad="0" width="200"> | 14 | v_pad="0" width="200"> |
15 | Input device (microphone): | 15 | Input device (microphone): |
16 | </text> | 16 | </text> |
17 | <combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top" | 17 | <combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top" |
18 | height="18" left_delta="0" max_chars="128" mouse_opaque="true" | 18 | height="18" left_delta="0" max_chars="128" mouse_opaque="true" |
19 | name="voice_input_device" width="225" /> | 19 | name="voice_input_device" width="225" /> |
20 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 20 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
21 | bottom_delta="-25" drop_shadow_visible="true" enabled="true" | 21 | bottom_delta="-25" drop_shadow_visible="true" enabled="true" |
22 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" | 22 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" |
23 | height="16" left_delta="0" mouse_opaque="true" | 23 | height="16" left_delta="0" mouse_opaque="true" |
24 | name="Output device (speakers):" v_pad="0" width="200"> | 24 | name="Output device (speakers):" v_pad="0" width="200"> |
25 | Output device (speakers): | 25 | Output device (speakers): |
26 | </text> | 26 | </text> |
27 | <combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top" | 27 | <combo_box allow_text_entry="false" bottom_delta="-20" enabled="true" follows="left|top" |
28 | height="18" left_delta="0" max_chars="128" mouse_opaque="true" | 28 | height="18" left_delta="0" max_chars="128" mouse_opaque="true" |
29 | name="voice_output_device" width="225" /> | 29 | name="voice_output_device" width="225" /> |
30 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 30 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
31 | bottom_delta="-30" drop_shadow_visible="true" enabled="true" | 31 | bottom_delta="-30" drop_shadow_visible="true" enabled="true" |
32 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" | 32 | follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" |
33 | height="16" left="6" mouse_opaque="true" name="Input level:" v_pad="0" | 33 | height="16" left="6" mouse_opaque="true" name="Input level:" v_pad="0" |
34 | width="200"> | 34 | width="200"> |
35 | Input Level | 35 | Input Level |
36 | </text> | 36 | </text> |
37 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false" | 37 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false" |
38 | enabled="false" font="SansSerifSmall" height="60" hide_border="true" | 38 | enabled="false" font="SansSerifSmall" height="60" hide_border="true" |
39 | hide_scrollbar="true" left_delta="10" max_length="65535" | 39 | hide_scrollbar="true" left_delta="10" max_length="65535" |
40 | mouse_opaque="true" name="voice_intro_text1" tab_stop="false" width="380" | 40 | mouse_opaque="true" name="voice_intro_text1" tab_stop="false" width="380" |
41 | word_wrap="true"> | 41 | word_wrap="true"> |
42 | Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone. | 42 | Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone. |
43 | </text_editor> | 43 | </text_editor> |
44 | <volume_slider bottom_delta="-18" enabled="true" follows="left|top" height="17" | 44 | <volume_slider bottom_delta="-18" enabled="true" follows="left|top" height="17" |
45 | increment="0.05" initial_val="0.5" left_delta="5" max_val="1" min_val="0" | 45 | increment="0.05" initial_val="0.5" left_delta="5" max_val="1" min_val="0" |
46 | mouse_opaque="true" name="mic_volume_slider" | 46 | mouse_opaque="true" name="mic_volume_slider" |
47 | tool_tip="Change the volume using this slider" width="90" /> | 47 | tool_tip="Change the volume using this slider" width="90" /> |
48 | <text bottom_delta="-4" follows="left|top" height="20" left_delta="95" | 48 | <text bottom_delta="-4" follows="left|top" height="20" left_delta="95" |
49 | name="wait_text" width="200"> | 49 | name="wait_text" width="200"> |
50 | Please wait | 50 | Please wait |
51 | </text> | 51 | </text> |
52 | <locate bottom_delta="-5" height="20" left_delta="0" name="bar0" width="20" /> | 52 | <locate bottom_delta="-5" height="20" left_delta="0" name="bar0" width="20" /> |
53 | <locate bottom_delta="0" height="20" left_delta="22" name="bar1" width="20" /> | 53 | <locate bottom_delta="0" height="20" left_delta="22" name="bar1" width="20" /> |
54 | <locate bottom_delta="0" height="20" left_delta="22" name="bar2" width="20" /> | 54 | <locate bottom_delta="0" height="20" left_delta="22" name="bar2" width="20" /> |
55 | <locate bottom_delta="0" height="20" left_delta="22" name="bar3" width="20" /> | 55 | <locate bottom_delta="0" height="20" left_delta="22" name="bar3" width="20" /> |
56 | <locate bottom_delta="0" height="20" left_delta="22" name="bar4" width="20" /> | 56 | <locate bottom_delta="0" height="20" left_delta="22" name="bar4" width="20" /> |
57 | <string name="default_text"> | 57 | <string name="default_text"> |
58 | Default | 58 | Default |
59 | </string> | 59 | </string> |
60 | </panel> | 60 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml index d8cb4d0..4280a9c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_bars.xml | |||
@@ -1,21 +1,21 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel enabled="true" follows="left|right|top|bottom" height="768" left="0" | 2 | <panel enabled="true" follows="left|right|top|bottom" height="768" left="0" |
3 | mouse_opaque="false" name="bottom_panel" width="1024"> | 3 | mouse_opaque="false" name="bottom_panel" width="1024"> |
4 | <panel auto_resize="true" background_visible="false" bottom="040" | 4 | <panel auto_resize="true" background_visible="false" bottom="040" |
5 | follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false" | 5 | follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false" |
6 | name="status" user_resize="false" width="1024" /> | 6 | name="status" user_resize="false" width="1024" /> |
7 | <layout_stack border_size="0" bottom="0" follows="left|right|bottom|top" height="768" | 7 | <layout_stack border_size="0" bottom="0" follows="left|right|bottom|top" height="768" |
8 | left="0" mouse_opaque="false" name="bar_stack" orientation="vertical" | 8 | left="0" mouse_opaque="false" name="bar_stack" orientation="vertical" |
9 | use_bounding_rect="true" width="1024"> | 9 | use_bounding_rect="true" width="1024"> |
10 | <layout_panel auto_resize="true" background_visible="false" bottom="0" | 10 | <layout_panel auto_resize="true" background_visible="false" bottom="0" |
11 | follows="left|right|top|bottom" height="768" left="0" mouse_opaque="false" | 11 | follows="left|right|top|bottom" height="768" left="0" mouse_opaque="false" |
12 | name="spacer" user_resize="false" width="1024" /> | 12 | name="spacer" user_resize="false" width="1024" /> |
13 | <layout_panel auto_resize="false" name="overlay" use_bounding_rect="true" user_resize="false" | 13 | <layout_panel auto_resize="false" name="overlay" use_bounding_rect="true" user_resize="false" |
14 | width="1024" /> | 14 | width="1024" /> |
15 | <layout_panel auto_resize="false" filename="panel_toolbar.xml" name="toolbar" | 15 | <layout_panel auto_resize="false" filename="panel_toolbar.xml" name="toolbar" |
16 | use_bounding_rect="true" user_resize="false" width="1024" /> | 16 | use_bounding_rect="true" user_resize="false" width="1024" /> |
17 | </layout_stack> | 17 | </layout_stack> |
18 | <panel auto_resize="true" background_visible="false" bottom="50" | 18 | <panel auto_resize="true" background_visible="false" bottom="50" |
19 | follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false" | 19 | follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false" |
20 | name="hud" user_resize="false" width="1024" /> | 20 | name="hud" user_resize="false" width="1024" /> |
21 | </panel> | 21 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_bg_tab.xml b/linden/indra/newview/skins/default/xui/en-us/panel_bg_tab.xml index 4da6be0..8308b8e 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_bg_tab.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_bg_tab.xml | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="21" | 2 | <panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="21" |
3 | left="0" name="bg_tab" use_bounding_rect="true" width="100"> | 3 | left="0" name="bg_tab" use_bounding_rect="true" width="100"> |
4 | <icon bottom="-24" color="255,255,255,245" scale_image="true" | 4 | <icon bottom="-24" color="255,255,255,245" scale_image="true" |
5 | follows="left|right|top|bottom" height="26" image_name="toolbar_tab.tga" | 5 | follows="left|right|top|bottom" height="26" image_name="toolbar_tab.tga" |
6 | left="1" width="100" /> | 6 | left="1" width="100" /> |
7 | </panel> | 7 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_bg_toolbar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_bg_toolbar.xml index af91e4e..bd8b18c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_bg_toolbar.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_bg_toolbar.xml | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="21" | 2 | <panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="21" |
3 | left="0" name="bg_toolbar" use_bounding_rect="true" width="100"> | 3 | left="0" name="bg_toolbar" use_bounding_rect="true" width="100"> |
4 | <icon bottom="-24" color="255,255,255,255" scale_image="true" | 4 | <icon bottom="-24" color="255,255,255,255" scale_image="true" |
5 | follows="left|right|top|bottom" height="26" image_name="toolbar_bg.tga" | 5 | follows="left|right|top|bottom" height="26" image_name="toolbar_bg.tga" |
6 | left="0" width="100" /> | 6 | left="0" width="100" /> |
7 | </panel> | 7 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml index f6eacb1..035c067 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel border="true" name="friends"> | 2 | <panel border="true" name="friends"> |
3 | <string name="Multiple"> | 3 | <string name="Multiple"> |
4 | Multiple friends... | 4 | Multiple friends... |
5 | </string> | 5 | </string> |
6 | <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true" | 6 | <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true" |
7 | follows="left|top|bottom|right" left="10" multi_select="true" | 7 | follows="left|top|bottom|right" left="10" multi_select="true" |
8 | name="friend_list" right="-100" search_column="1" | 8 | name="friend_list" right="-100" search_column="1" |
9 | tool_tip="Hold shift or control while clicking to select multiple friends" | 9 | tool_tip="Hold shift or control while clicking to select multiple friends" |
10 | top="-10"> | 10 | top="-10"> |
11 | <column image="ff_online_status_button.tga" name="icon_online_status" | 11 | <column image="ff_online_status_button.tga" name="icon_online_status" |
12 | tool_tip="Online status" width="20" /> | 12 | tool_tip="Online status" width="20" /> |
13 | <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" /> | 13 | <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" /> |
14 | <column image="ff_visible_online_button.tga" name="icon_visible_online" | 14 | <column image="ff_visible_online_button.tga" name="icon_visible_online" |
15 | tool_tip="Friend can see when you're online" width="20" /> | 15 | tool_tip="Friend can see when you're online" width="20" /> |
16 | <column image="ff_visible_map_button.tga" name="icon_visible_map" | 16 | <column image="ff_visible_map_button.tga" name="icon_visible_map" |
17 | tool_tip="Friend can locate you on the map" width="20" /> | 17 | tool_tip="Friend can locate you on the map" width="20" /> |
18 | <column image="ff_edit_mine_button.tga" name="icon_edit_mine" | 18 | <column image="ff_edit_mine_button.tga" name="icon_edit_mine" |
19 | tool_tip="Friend can edit, delete or take objects" width="20" /> | 19 | tool_tip="Friend can edit, delete or take objects" width="20" /> |
20 | <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" | 20 | <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" |
21 | tool_tip="You can edit this friend's objects" width="20" /> | 21 | tool_tip="You can edit this friend's objects" width="20" /> |
22 | <column name="friend_last_update_generation" width="0" /> | 22 | <column name="friend_last_update_generation" width="0" /> |
23 | </scroll_list> | 23 | </scroll_list> |
24 | <pad bottom="-7" height="0" left="-90" width="1" /> | 24 | <pad bottom="-7" height="0" left="-90" width="1" /> |
25 | <button bottom_delta="-25" follows="top|right" height="22" label="IM/Call" | 25 | <button bottom_delta="-25" follows="top|right" height="22" label="IM/Call" |
26 | left_delta="0" name="im_btn" tool_tip="Open Instant Message session" | 26 | left_delta="0" name="im_btn" tool_tip="Open Instant Message session" |
27 | width="80" /> | 27 | width="80" /> |
28 | <button bottom_delta="-25" follows="top|right" height="22" label="Profile" | 28 | <button bottom_delta="-25" follows="top|right" height="22" label="Profile" |
29 | left_delta="0" name="profile_btn" | 29 | left_delta="0" name="profile_btn" |
30 | tool_tip="Show picture, groups, and other information" width="80" /> | 30 | tool_tip="Show picture, groups, and other information" width="80" /> |
31 | <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..." | 31 | <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..." |
32 | left_delta="0" name="offer_teleport_btn" | 32 | left_delta="0" name="offer_teleport_btn" |
33 | tool_tip="Offer this friend a teleport to your current location" width="80" /> | 33 | tool_tip="Offer this friend a teleport to your current location" width="80" /> |
34 | <button bottom_delta="-25" follows="top|right" height="22" label="Pay..." | 34 | <button bottom_delta="-25" follows="top|right" height="22" label="Pay..." |
35 | left_delta="0" name="pay_btn" | 35 | left_delta="0" name="pay_btn" |
36 | tool_tip="Give Linden dollars (L$) to this friend" width="80" /> | 36 | tool_tip="Give Linden dollars (L$) to this friend" width="80" /> |
37 | <button bottom_delta="-25" follows="top|right" height="22" label="Remove..." | 37 | <button bottom_delta="-25" follows="top|right" height="22" label="Remove..." |
38 | left_delta="0" name="remove_btn" | 38 | left_delta="0" name="remove_btn" |
39 | tool_tip="Remove this person from your friends list" width="80" /> | 39 | tool_tip="Remove this person from your friends list" width="80" /> |
40 | <button bottom_delta="-35" follows="top|right" height="22" label="Add..." | 40 | <button bottom_delta="-35" follows="top|right" height="22" label="Add..." |
41 | left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident" | 41 | left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident" |
42 | width="80" /> | 42 | width="80" /> |
43 | </panel> | 43 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml index 3c3f8b1..7266536 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_media_remote_expanded.xml | |||
@@ -1,33 +1,33 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bg_visible="false" border="false" border_visible="false" bottom="1" | 2 | <panel bg_visible="false" border="false" border_visible="false" bottom="1" |
3 | follows="right|bottom" height="185" left="0" name="media_remote" | 3 | follows="right|bottom" height="185" left="0" name="media_remote" |
4 | use_bounding_rect="true" width="220"> | 4 | use_bounding_rect="true" width="220"> |
5 | <panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="220" /> | 5 | <panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="220" /> |
6 | <panel border="false" bottom="22" filename="panel_audio.xml" height="160" | 6 | <panel border="false" bottom="22" filename="panel_audio.xml" height="160" |
7 | label="Audio & Video" name="Volume Panel" width="220" /> | 7 | label="Audio & Video" name="Volume Panel" width="220" /> |
8 | <panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" /> | 8 | <panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" /> |
9 | <string name="play_label"> | 9 | <string name="play_label"> |
10 | Play | 10 | Play |
11 | </string> | 11 | </string> |
12 | <string name="stop_label"> | 12 | <string name="stop_label"> |
13 | Stop | 13 | Stop |
14 | </string> | 14 | </string> |
15 | <string name="pause_label"> | 15 | <string name="pause_label"> |
16 | Pause | 16 | Pause |
17 | </string> | 17 | </string> |
18 | <string name="default_tooltip_label"> | 18 | <string name="default_tooltip_label"> |
19 | No Media Specified | 19 | No Media Specified |
20 | </string> | 20 | </string> |
21 | <string name="media_hidden_label"> | 21 | <string name="media_hidden_label"> |
22 | (URL hidden by parcel owner) | 22 | (URL hidden by parcel owner) |
23 | </string> | 23 | </string> |
24 | <string name="media_icon_tooltip_web"> | 24 | <string name="media_icon_tooltip_web"> |
25 | This location displays content from the World Wide Web. Click the Play button to display Web content. | 25 | This location displays content from the World Wide Web. Click the Play button to display Web content. |
26 | </string> | 26 | </string> |
27 | <string name="media_icon_tooltip_movie"> | 27 | <string name="media_icon_tooltip_movie"> |
28 | This location displays Video content. Click the Play button to play the video. | 28 | This location displays Video content. Click the Play button to play the video. |
29 | </string> | 29 | </string> |
30 | <string name="media_play_tooltip"> | 30 | <string name="media_play_tooltip"> |
31 | Display Web content at this location. | 31 | Display Web content at this location. |
32 | </string> | 32 | </string> |
33 | </panel> | 33 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml index d3174af..8020e9a 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml | |||
@@ -28,7 +28,7 @@ | |||
28 | width="350" /> | 28 | width="350" /> |
29 | <check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top" | 29 | <check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top" |
30 | font="SansSerifSmall" height="16" initial_value="false" | 30 | font="SansSerifSmall" height="16" initial_value="false" |
31 | label="Include IM in Local Chat" left="148" mouse_opaque="true" | 31 | label="Show IMs with Chat" left="148" mouse_opaque="true" |
32 | name="include_im_in_chat_history" radio_style="false" width="237" /> | 32 | name="include_im_in_chat_history" radio_style="false" width="237" /> |
33 | <check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top" | 33 | <check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top" |
34 | font="SansSerifSmall" height="16" initial_value="false" | 34 | font="SansSerifSmall" height="16" initial_value="false" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml index a3ee65d..99cae27 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml | |||
@@ -1,22 +1,22 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" | 2 | <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" |
3 | height="408" label="Skins" left="102" mouse_opaque="true" | 3 | height="408" label="Skins" left="102" mouse_opaque="true" |
4 | name="Skins panel" width="517"> | 4 | name="Skins panel" width="517"> |
5 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 5 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
6 | bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top" | 6 | bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top" |
7 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" | 7 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" |
8 | mouse_opaque="true" name="muting_text" v_pad="0" width="400"> | 8 | mouse_opaque="true" name="muting_text" v_pad="0" width="400"> |
9 | Select a skin (requires restart): | 9 | Select a skin (requires restart): |
10 | </text> | 10 | </text> |
11 | <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12" | 11 | <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12" |
12 | name="skin_selection" width="480"> | 12 | name="skin_selection" width="480"> |
13 | <radio_item bottom="-20" height="20" left="0" name="default" width="480"> | 13 | <radio_item bottom="-20" height="20" left="0" name="default" width="480"> |
14 | Default | 14 | Default |
15 | </radio_item> | 15 | </radio_item> |
16 | <radio_item bottom="-180" height="20" left="0" name="silver" width="480"> | 16 | <radio_item bottom="-180" height="20" left="0" name="silver" width="480"> |
17 | Silver | 17 | Silver |
18 | </radio_item> | 18 | </radio_item> |
19 | </radio_group> | 19 | </radio_group> |
20 | <button left="130" bottom="-160" width="298" height="130" name="classic_preview" label="" scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png"/> | 20 | <button left="130" bottom="-160" width="298" height="130" name="classic_preview" label="" scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png"/> |
21 | <button left="130" bottom="-320" width="298" height="130" name="silver_preview" label="" scale_image="true" image_selected="skin_thumbnail_silver.png" image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" image_hover_unselected="skin_thumbnail_silver.png"/> | 21 | <button left="130" bottom="-320" width="298" height="130" name="silver_preview" label="" scale_image="true" image_selected="skin_thumbnail_silver.png" image_hover_selected="skin_thumbnail_silver.png" image_unselected="skin_thumbnail_silver.png" image_hover_unselected="skin_thumbnail_silver.png"/> |
22 | </panel> | 22 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml index 2d36853..89b07dd 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml | |||
@@ -1,81 +1,81 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" | 2 | <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom" |
3 | height="408" label="Voice Chat" left="102" mouse_opaque="true" name="chat" | 3 | height="408" label="Voice Chat" left="102" mouse_opaque="true" name="chat" |
4 | width="517"> | 4 | width="517"> |
5 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26" | 5 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-26" |
6 | embedded_items="false" enabled="false" follows="left|top" | 6 | embedded_items="false" enabled="false" follows="left|top" |
7 | font="SansSerifSmall" height="20" hide_border="true" hide_scrollbar="true" | 7 | font="SansSerifSmall" height="20" hide_border="true" hide_scrollbar="true" |
8 | left_delta="8" max_length="65535" mouse_opaque="true" | 8 | left_delta="8" max_length="65535" mouse_opaque="true" |
9 | name="voice_unavailable" tab_stop="false" width="450" word_wrap="true"> | 9 | name="voice_unavailable" tab_stop="false" width="450" word_wrap="true"> |
10 | Voice Chat Is Not Available | 10 | Voice Chat Is Not Available |
11 | </text_editor> | 11 | </text_editor> |
12 | <check_box bottom_delta="0" control_name="EnableVoiceChat" enabled="true" | 12 | <check_box bottom_delta="0" control_name="EnableVoiceChat" enabled="true" |
13 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" | 13 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" |
14 | label="Enable voice chat" left="8" mouse_opaque="true" | 14 | label="Enable voice chat" left="8" mouse_opaque="true" |
15 | name="enable_voice_check" radio_style="false" width="200" /> | 15 | name="enable_voice_check" radio_style="false" width="200" /> |
16 | <radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40" | 16 | <radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40" |
17 | left_delta="20" name="ear_location" width="364"> | 17 | left_delta="20" name="ear_location" width="364"> |
18 | <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315"> | 18 | <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315"> |
19 | Hear Voice Chat from camera position. | 19 | Hear Voice Chat from camera position. |
20 | </radio_item> | 20 | </radio_item> |
21 | <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315"> | 21 | <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315"> |
22 | Hear Voice Chat from avatar position. | 22 | Hear Voice Chat from avatar position. |
23 | </radio_item> | 23 | </radio_item> |
24 | </radio_group> | 24 | </radio_group> |
25 | <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20" | 25 | <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20" |
26 | embedded_items="false" enabled="true" follows="left|top" | 26 | embedded_items="false" enabled="true" follows="left|top" |
27 | font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true" | 27 | font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true" |
28 | left_delta="0" max_length="65535" mouse_opaque="true" | 28 | left_delta="0" max_length="65535" mouse_opaque="true" |
29 | name="push_to_talk_heading" width="445" word_wrap="true"> | 29 | name="push_to_talk_heading" width="445" word_wrap="true"> |
30 | Push To Talk | 30 | Push To Talk |
31 | </text> | 31 | </text> |
32 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-60" | 32 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-60" |
33 | embedded_items="false" enabled="false" follows="left|top" | 33 | embedded_items="false" enabled="false" follows="left|top" |
34 | font="SansSerifSmall" height="65" hide_border="true" hide_scrollbar="true" | 34 | font="SansSerifSmall" height="65" hide_border="true" hide_scrollbar="true" |
35 | left_delta="20" max_length="65535" mouse_opaque="true" | 35 | left_delta="20" max_length="65535" mouse_opaque="true" |
36 | name="voice_chat_description" tab_stop="false" width="450" word_wrap="true"> | 36 | name="voice_chat_description" tab_stop="false" width="450" word_wrap="true"> |
37 | Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down. | 37 | Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down. |
38 | </text_editor> | 38 | </text_editor> |
39 | <check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true" | 39 | <check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true" |
40 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" | 40 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" |
41 | label="Use Push-to-Talk in toggle mode" left_delta="0" mouse_opaque="true" | 41 | label="Use Push-to-Talk in toggle mode" left_delta="0" mouse_opaque="true" |
42 | name="push_to_talk_toggle_check" radio_style="false" width="200" /> | 42 | name="push_to_talk_toggle_check" radio_style="false" width="200" /> |
43 | <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20" | 43 | <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20" |
44 | embedded_items="false" enabled="true" follows="left|top" | 44 | embedded_items="false" enabled="true" follows="left|top" |
45 | font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true" | 45 | font="SansSerifSmall" height="16" hide_border="true" hide_scrollbar="true" |
46 | left_delta="4" max_length="65535" mouse_opaque="true" | 46 | left_delta="4" max_length="65535" mouse_opaque="true" |
47 | name="push_to_talk_label" width="445" word_wrap="true"> | 47 | name="push_to_talk_label" width="445" word_wrap="true"> |
48 | Push-to-Talk trigger: | 48 | Push-to-Talk trigger: |
49 | </text> | 49 | </text> |
50 | <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20" | 50 | <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20" |
51 | control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false" | 51 | control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false" |
52 | follows="top|left" font="SansSerifSmall" halign="right" height="19" | 52 | follows="top|left" font="SansSerifSmall" halign="right" height="19" |
53 | left_delta="0" max_length="254" mouse_opaque="false" name="modifier_combo" | 53 | left_delta="0" max_length="254" mouse_opaque="false" name="modifier_combo" |
54 | width="280" /> | 54 | width="280" /> |
55 | <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center" | 55 | <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center" |
56 | height="20" label="Set Key" left_delta="0" mouse_opaque="true" | 56 | height="20" label="Set Key" left_delta="0" mouse_opaque="true" |
57 | name="set_voice_hotkey_button" width="115" /> | 57 | name="set_voice_hotkey_button" width="115" /> |
58 | <button bottom_delta="0" follows="left" font="SansSerif" halign="center" height="20" | 58 | <button bottom_delta="0" follows="left" font="SansSerif" halign="center" height="20" |
59 | label="Middle Mouse Button" left_delta="120" mouse_opaque="true" | 59 | label="Middle Mouse Button" left_delta="120" mouse_opaque="true" |
60 | name="set_voice_middlemouse_button" width="160" /> | 60 | name="set_voice_middlemouse_button" width="160" /> |
61 | <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25" | 61 | <text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25" |
62 | embedded_items="false" enabled="true" follows="left|top" height="16" | 62 | embedded_items="false" enabled="true" follows="left|top" height="16" |
63 | left="28" name="privacy_heading" width="445"> | 63 | left="28" name="privacy_heading" width="445"> |
64 | Privacy Options | 64 | Privacy Options |
65 | </text> | 65 | </text> |
66 | <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" enabled="true" | 66 | <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" enabled="true" |
67 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" | 67 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" |
68 | label="Only accept voice calls from people on My Friends list" | 68 | label="Only accept voice calls from people on My Friends list" |
69 | left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check" | 69 | left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check" |
70 | radio_style="false" width="200" /> | 70 | radio_style="false" width="200" /> |
71 | <button bottom_delta="-40" follows="left|top" font="SansSerif" height="20" | 71 | <button bottom_delta="-40" follows="left|top" font="SansSerif" height="20" |
72 | label="Device Settings" left="28" mouse_opaque="true" | 72 | label="Device Settings" left="28" mouse_opaque="true" |
73 | name="device_settings_btn" width="155" /> | 73 | name="device_settings_btn" width="155" /> |
74 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-32" | 74 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-32" |
75 | embedded_items="false" enabled="false" follows="left|top" | 75 | embedded_items="false" enabled="false" follows="left|top" |
76 | font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true" | 76 | font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true" |
77 | left="28" max_length="65535" mouse_opaque="true" | 77 | left="28" max_length="65535" mouse_opaque="true" |
78 | name="device_settings_text" tab_stop="false" width="450" word_wrap="true"> | 78 | name="device_settings_text" tab_stop="false" width="450" word_wrap="true"> |
79 | NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat. | 79 | NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat. |
80 | </text_editor> | 80 | </text_editor> |
81 | </panel> | 81 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml index f6c1887..aa721d9 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml | |||
@@ -1,70 +1,70 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bevel_style="in" border="true" bottom="0" follows="left|bottom|right" | 2 | <panel bevel_style="in" border="true" bottom="0" follows="left|bottom|right" |
3 | height="120" left="0" name="active_speakers_panel" width="140"> | 3 | height="120" left="0" name="active_speakers_panel" width="140"> |
4 | <string name="moderator_label"> | 4 | <string name="moderator_label"> |
5 | (Moderator) | 5 | (Moderator) |
6 | </string> | 6 | </string> |
7 | <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="123" left="0" | 7 | <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="123" left="0" |
8 | orientation="vertical" tab_group="1" width="140" name="panels"> | 8 | orientation="vertical" tab_group="1" width="140" name="panels"> |
9 | <layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0" | 9 | <layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0" |
10 | min_height="25" name="moderation_mode_panel" top_delta="0" | 10 | min_height="25" name="moderation_mode_panel" top_delta="0" |
11 | user_resize="false" visible="false" width="140"> | 11 | user_resize="false" visible="false" width="140"> |
12 | <combo_box bottom="0" follows="left|top|right|bottom" height="20" left="5" | 12 | <combo_box bottom="0" follows="left|top|right|bottom" height="20" left="5" |
13 | name="moderation_mode" width="130"> | 13 | name="moderation_mode" width="130"> |
14 | <combo_item name="OpenVoice" value="unmoderated"> | 14 | <combo_item name="OpenVoice" value="unmoderated"> |
15 | Voices on by default | 15 | Voices on by default |
16 | </combo_item> | 16 | </combo_item> |
17 | <combo_item name="ModeratedVoice" value="moderated"> | 17 | <combo_item name="ModeratedVoice" value="moderated"> |
18 | Voices off by default | 18 | Voices off by default |
19 | </combo_item> | 19 | </combo_item> |
20 | </combo_box> | 20 | </combo_box> |
21 | </layout_panel> | 21 | </layout_panel> |
22 | <layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" left="0" | 22 | <layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" left="0" |
23 | min_height="100" name="moderate_chat_panel" top_delta="0" | 23 | min_height="100" name="moderate_chat_panel" top_delta="0" |
24 | user_resize="false" visible="true" width="140"> | 24 | user_resize="false" visible="true" width="140"> |
25 | <scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" | 25 | <scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" |
26 | draw_stripes="false" follows="left|top|bottom|right" left="0" | 26 | draw_stripes="false" follows="left|top|bottom|right" left="0" |
27 | multi_select="false" name="speakers_list" right="140" search_column="1" | 27 | multi_select="false" name="speakers_list" right="140" search_column="1" |
28 | sort_column="2" top="120"> | 28 | sort_column="2" top="120"> |
29 | <column name="icon_speaking_status" sort="speaking_status" width="20" /> | 29 | <column name="icon_speaking_status" sort="speaking_status" width="20" /> |
30 | <column dynamicwidth="true" label="Name" name="speaker_name" /> | 30 | <column dynamicwidth="true" label="Name" name="speaker_name" /> |
31 | <column label="" name="speaking_status" width="0" /> | 31 | <column label="" name="speaking_status" width="0" /> |
32 | </scroll_list> | 32 | </scroll_list> |
33 | <panel border="false" bottom="0" can_resize="false" follows="left|bottom|right" | 33 | <panel border="false" bottom="0" can_resize="false" follows="left|bottom|right" |
34 | height="77" left="0" mouse_opaque="true" name="speaker_controls" | 34 | height="77" left="0" mouse_opaque="true" name="speaker_controls" |
35 | width="140"> | 35 | width="140"> |
36 | <button bottom="-28" enabled="false" follows="left|top" height="20" | 36 | <button bottom="-28" enabled="false" follows="left|top" height="20" |
37 | image_overlay="icon_avatar_offline.tga" label="" left="4" | 37 | image_overlay="icon_avatar_offline.tga" label="" left="4" |
38 | name="profile_btn" right="34" scale_image="true"/> | 38 | name="profile_btn" right="34" scale_image="true"/> |
39 | <text bottom_delta="9" follows="left|top|right" font="SansSerif" left_delta="34" | 39 | <text bottom_delta="9" follows="left|top|right" font="SansSerif" left_delta="34" |
40 | name="resident_name" valign="center" width="140"> | 40 | name="resident_name" valign="center" width="140"> |
41 | Rumplstiltskin Califragilistic | 41 | Rumplstiltskin Califragilistic |
42 | </text> | 42 | </text> |
43 | <volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" | 43 | <volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" |
44 | initial_val="0.5" left="0" max_val="1.0" min_val="0.0" | 44 | initial_val="0.5" left="0" max_val="1.0" min_val="0.0" |
45 | name="speaker_volume" width="110" /> | 45 | name="speaker_volume" width="110" /> |
46 | <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" | 46 | <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" |
47 | image_unselected="icn_speaker_dark.tga" label="" left_delta="110" | 47 | image_unselected="icn_speaker_dark.tga" label="" left_delta="110" |
48 | name="mute_btn" tool_tip="Mute voice for this resident" width="25" /> | 48 | name="mute_btn" tool_tip="Mute voice for this resident" width="25" /> |
49 | <check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" | 49 | <check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" |
50 | label="Mute Text" left="3" name="mute_text_btn" width="50" /> | 50 | label="Mute Text" left="3" name="mute_text_btn" width="50" /> |
51 | </panel> | 51 | </panel> |
52 | </layout_panel> | 52 | </layout_panel> |
53 | <layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0" | 53 | <layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0" |
54 | name="moderator_controls" top_delta="0" user_resize="false" visible="false" | 54 | name="moderator_controls" top_delta="0" user_resize="false" visible="false" |
55 | width="140"> | 55 | width="140"> |
56 | <text bottom="-20" follows="left|right|top|bottom" height="20" left="5" | 56 | <text bottom="-20" follows="left|right|top|bottom" height="20" left="5" |
57 | name="moderator_controls_label" right="-5"> | 57 | name="moderator_controls_label" right="-5"> |
58 | Moderator Controls: | 58 | Moderator Controls: |
59 | </text> | 59 | </text> |
60 | <check_box bottom_delta="-16" follows="left|right|top|bottom" height="20" left_delta="0" | 60 | <check_box bottom_delta="-16" follows="left|right|top|bottom" height="20" left_delta="0" |
61 | name="moderator_allow_voice" right="-5"> | 61 | name="moderator_allow_voice" right="-5"> |
62 | Allow voice chat | 62 | Allow voice chat |
63 | </check_box> | 63 | </check_box> |
64 | <check_box bottom_delta="-20" follows="left|right|top|bottom" height="20" left_delta="0" | 64 | <check_box bottom_delta="-20" follows="left|right|top|bottom" height="20" left_delta="0" |
65 | name="moderator_allow_text" right="-5"> | 65 | name="moderator_allow_text" right="-5"> |
66 | Allow text chat | 66 | Allow text chat |
67 | </check_box> | 67 | </check_box> |
68 | </layout_panel> | 68 | </layout_panel> |
69 | </layout_stack> | 69 | </layout_stack> |
70 | </panel> | 70 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml index c588dc5..1d73a53 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml | |||
@@ -1,19 +1,19 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bg_visible="false" border="false" border_visible="false" bottom="2" | 2 | <panel bg_visible="false" border="false" border_visible="false" bottom="2" |
3 | enabled="true" follows="right|bottom" height="20" left="0" | 3 | enabled="true" follows="right|bottom" height="20" left="0" |
4 | mouse_opaque="true" name="voice_controls" width="128"> | 4 | mouse_opaque="true" name="voice_controls" width="128"> |
5 | <button bottom="-22" height="22" image_overlay="active_speakers.tga" label="" left="2" | 5 | <button bottom="-22" height="22" image_overlay="active_speakers.tga" label="" left="2" |
6 | name="speakers_btn" | 6 | name="speakers_btn" |
7 | tool_tip="Show list of residents using voice chat around you" width="38" /> | 7 | tool_tip="Show list of residents using voice chat around you" width="38" /> |
8 | <button bottom="-22" height="22" label="Talk" left_delta="40" name="push_to_talk" | 8 | <button bottom="-22" height="22" label="Talk" left_delta="40" name="push_to_talk" |
9 | tab_stop="false" tool_tip="Hold the button to talk" width="64" /> | 9 | tab_stop="false" tool_tip="Hold the button to talk" width="64" /> |
10 | <button bottom="-19" height="16" image_selected="ptt_lock_on.tga" | 10 | <button bottom="-19" height="16" image_selected="ptt_lock_on.tga" |
11 | image_unselected="ptt_lock_off.tga" label="" left_delta="4" name="ptt_lock" | 11 | image_unselected="ptt_lock_off.tga" label="" left_delta="4" name="ptt_lock" |
12 | scale_image="false" toggle="true" | 12 | scale_image="false" toggle="true" |
13 | tool_tip="Click lock to switch to talk mode" width="16" /> | 13 | tool_tip="Click lock to switch to talk mode" width="16" /> |
14 | <icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="42" | 14 | <icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="42" |
15 | name="voice_volume" width="16" /> | 15 | name="voice_volume" width="16" /> |
16 | <button bottom="-22" control_name="ShowVoiceChannelPopup" height="22" label="" | 16 | <button bottom="-22" control_name="ShowVoiceChannelPopup" height="22" label="" |
17 | left_delta="20" name="show_channel" scale_image="true" toggle="true" | 17 | left_delta="20" name="show_channel" scale_image="true" toggle="true" |
18 | tool_tip="Click to show current voice channel" width="22" /> | 18 | tool_tip="Click to show current voice channel" width="22" /> |
19 | </panel> | 19 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml index fdec2f4..a5de96c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_enable.xml | |||
@@ -1,37 +1,37 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel border="false" bottom="4" enabled="true" height="240" left="8" | 2 | <panel border="false" bottom="4" enabled="true" height="240" left="8" |
3 | mouse_opaque="true" name="content_panel" width="404"> | 3 | mouse_opaque="true" name="content_panel" width="404"> |
4 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false" | 4 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false" |
5 | enabled="false" font="SansSerifSmall" height="85" hide_border="true" | 5 | enabled="false" font="SansSerifSmall" height="85" hide_border="true" |
6 | hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true" | 6 | hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true" |
7 | name="voice_intro_text1" tab_stop="false" width="400" word_wrap="true"> | 7 | name="voice_intro_text1" tab_stop="false" width="400" word_wrap="true"> |
8 | Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone. | 8 | Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone. |
9 | </text_editor> | 9 | </text_editor> |
10 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false" | 10 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false" |
11 | enabled="false" font="SansSerifSmall" height="50" hide_border="true" | 11 | enabled="false" font="SansSerifSmall" height="50" hide_border="true" |
12 | hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true" | 12 | hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true" |
13 | name="voice_intro_text2" tab_stop="false" width="400" word_wrap="true"> | 13 | name="voice_intro_text2" tab_stop="false" width="400" word_wrap="true"> |
14 | Voice Chat is enabled by default. Do you wish to continue using Voice Chat? | 14 | Voice Chat is enabled by default. Do you wish to continue using Voice Chat? |
15 | </text_editor> | 15 | </text_editor> |
16 | <radio_group bottom_delta="-30" draw_border="false" enabled="true" follows="left|top" | 16 | <radio_group bottom_delta="-30" draw_border="false" enabled="true" follows="left|top" |
17 | height="40" left="10" mouse_opaque="true" name="voice_enable" width="364"> | 17 | height="40" left="10" mouse_opaque="true" name="voice_enable" width="364"> |
18 | <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="1" width="315"> | 18 | <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="1" width="315"> |
19 | Yes, continue using Voice Chat. | 19 | Yes, continue using Voice Chat. |
20 | </radio_item> | 20 | </radio_item> |
21 | <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="0" width="315"> | 21 | <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="0" width="315"> |
22 | No, disable Voice Chat. | 22 | No, disable Voice Chat. |
23 | </radio_item> | 23 | </radio_item> |
24 | </radio_group> | 24 | </radio_group> |
25 | <text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-50" | 25 | <text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-50" |
26 | embedded_items="false" enabled="false" font="SansSerifSmall" height="40" | 26 | embedded_items="false" enabled="false" font="SansSerifSmall" height="40" |
27 | hide_border="true" hide_scrollbar="true" left="0" max_length="65535" | 27 | hide_border="true" hide_scrollbar="true" left="0" max_length="65535" |
28 | name="voice_intro_text3" tab_stop="false" width="400" word_wrap="true"> | 28 | name="voice_intro_text3" tab_stop="false" width="400" word_wrap="true"> |
29 | You can enable Voice Chat at any time by going to the Voice Chat tab in Preferences. | 29 | You can enable Voice Chat at any time by going to the Voice Chat tab in Preferences. |
30 | </text_editor> | 30 | </text_editor> |
31 | <text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="0" | 31 | <text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="0" |
32 | embedded_items="false" enabled="false" font="SansSerifSmall" height="40" | 32 | embedded_items="false" enabled="false" font="SansSerifSmall" height="40" |
33 | hide_border="true" hide_scrollbar="true" left="0" max_length="65535" | 33 | hide_border="true" hide_scrollbar="true" left="0" max_length="65535" |
34 | name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true"> | 34 | name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true"> |
35 | Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life. | 35 | Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life. |
36 | </text_editor> | 36 | </text_editor> |
37 | </panel> \ No newline at end of file | 37 | </panel> \ No newline at end of file |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml index 494cd39..4c6edfd 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_options.xml | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel border="false" bottom="36" height="240" left="8" name="content_panel" | 2 | <panel border="false" bottom="36" height="240" left="8" name="content_panel" |
3 | width="404"> | 3 | width="404"> |
4 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false" | 4 | <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false" |
5 | enabled="false" font="SansSerifSmall" height="30" hide_border="true" | 5 | enabled="false" font="SansSerifSmall" height="30" hide_border="true" |
6 | hide_scrollbar="true" left_delta="0" max_length="65535" | 6 | hide_scrollbar="true" left_delta="0" max_length="65535" |
7 | name="voice_intro_text1" tab_stop="false" width="414" word_wrap="true"> | 7 | name="voice_intro_text1" tab_stop="false" width="414" word_wrap="true"> |
8 | Use the options below to configure your Voice Chat experience. | 8 | Use the options below to configure your Voice Chat experience. |
9 | </text_editor> | 9 | </text_editor> |
10 | <radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40" left="10" | 10 | <radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40" left="10" |
11 | name="ear_location" width="364"> | 11 | name="ear_location" width="364"> |
12 | <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315"> | 12 | <radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315"> |
13 | Hear Voice Chat from camera position. | 13 | Hear Voice Chat from camera position. |
14 | </radio_item> | 14 | </radio_item> |
15 | <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315"> | 15 | <radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315"> |
16 | Hear Voice Chat from avatar position. | 16 | Hear Voice Chat from avatar position. |
17 | </radio_item> | 17 | </radio_item> |
18 | </radio_group> | 18 | </radio_group> |
19 | <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" follows="left|top" | 19 | <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" follows="left|top" |
20 | font="SansSerifSmall" height="16" initial_value="false" | 20 | font="SansSerifSmall" height="16" initial_value="false" |
21 | label="Only allow Friends to initiate Voice Calls with me" left="20" | 21 | label="Only allow Friends to initiate Voice Calls with me" left="20" |
22 | left_delta="2" name="friends_only_check" width="200" /> | 22 | left_delta="2" name="friends_only_check" width="200" /> |
23 | <check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top" | 23 | <check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top" |
24 | font="SansSerifSmall" height="16" initial_value="false" | 24 | font="SansSerifSmall" height="16" initial_value="false" |
25 | label="Use Push-to-Talk in toggle mode" left_delta="0" | 25 | label="Use Push-to-Talk in toggle mode" left_delta="0" |
26 | name="push_to_talk_toggle_check" width="200" /> | 26 | name="push_to_talk_toggle_check" width="200" /> |
27 | <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20" | 27 | <text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20" |
28 | embedded_items="false" follows="left|top" font="SansSerifSmall" height="16" | 28 | embedded_items="false" follows="left|top" font="SansSerifSmall" height="16" |
29 | hide_border="true" hide_scrollbar="true" left_delta="4" max_length="65535" | 29 | hide_border="true" hide_scrollbar="true" left_delta="4" max_length="65535" |
30 | name="push_to_talk_label" width="445" word_wrap="true"> | 30 | name="push_to_talk_label" width="445" word_wrap="true"> |
31 | Push-to-Talk trigger: | 31 | Push-to-Talk trigger: |
32 | </text> | 32 | </text> |
33 | <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20" | 33 | <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20" |
34 | control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false" | 34 | control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false" |
35 | follows="top|left" font="SansSerifSmall" halign="right" height="19" | 35 | follows="top|left" font="SansSerifSmall" halign="right" height="19" |
36 | left_delta="0" max_length="254" name="modifier_combo" width="280" /> | 36 | left_delta="0" max_length="254" name="modifier_combo" width="280" /> |
37 | <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center" | 37 | <button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center" |
38 | height="20" label="Set Key" left_delta="0" name="set_voice_hotkey_button" | 38 | height="20" label="Set Key" left_delta="0" name="set_voice_hotkey_button" |
39 | width="115" /> | 39 | width="115" /> |
40 | <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" | 40 | <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" |
41 | height="20" label="Middle Mouse Button" left_delta="120" | 41 | height="20" label="Middle Mouse Button" left_delta="120" |
42 | name="set_voice_middlemouse_button" width="160" /> | 42 | name="set_voice_middlemouse_button" width="160" /> |
43 | </panel> | 43 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml index c785e72..a0dc47b 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml | |||
@@ -1,8 +1,8 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bg_visible="false" border="false" border_visible="false" bottom="0" | 2 | <panel bg_visible="false" border="false" border_visible="false" bottom="0" |
3 | enabled="true" follows="right|bottom" height="20" left="0" | 3 | enabled="true" follows="right|bottom" height="20" left="0" |
4 | mouse_opaque="true" name="voice_remote" use_bounding_rect="true" | 4 | mouse_opaque="true" name="voice_remote" use_bounding_rect="true" |
5 | width="130"> | 5 | width="130"> |
6 | <panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="130" /> | 6 | <panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="130" /> |
7 | <panel bottom="3" filename="panel_voice_controls.xml" height="20" left="1" width="130" /> | 7 | <panel bottom="3" filename="panel_voice_controls.xml" height="20" left="1" width="130" /> |
8 | </panel> | 8 | </panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml index 7464467..88cc305 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml | |||
@@ -1,20 +1,20 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <panel bg_visible="false" border="false" border_visible="false" bottom="0" | 2 | <panel bg_visible="false" border="false" border_visible="false" bottom="0" |
3 | follows="right|bottom" height="45" left="0" mouse_opaque="true" | 3 | follows="right|bottom" height="45" left="0" mouse_opaque="true" |
4 | name="voice_remote" use_bounding_rect="true" width="130"> | 4 | name="voice_remote" use_bounding_rect="true" width="130"> |
5 | <panel bottom="1" filename="panel_bg_tab.xml" height="47" left="0" width="130" /> | 5 | <panel bottom="1" filename="panel_bg_tab.xml" height="47" left="0" width="130" /> |
6 | <button bottom="-20" height="20" image_overlay="icn_voice-call-end.tga" label="" | 6 | <button bottom="-20" height="20" image_overlay="icn_voice-call-end.tga" label="" |
7 | left="4" name="end_call_btn" tool_tip="Click to hang up" width="20" /> | 7 | left="4" name="end_call_btn" tool_tip="Click to hang up" width="20" /> |
8 | <button bottom="-21" height="22" image_disabled="icn_rounded-text-field.tga" | 8 | <button bottom="-21" height="22" image_disabled="icn_rounded-text-field.tga" |
9 | image_disabled_selected="icn_rounded-text-field.tga" | 9 | image_disabled_selected="icn_rounded-text-field.tga" |
10 | image_hover_selected="icn_rounded-text-field.tga" | 10 | image_hover_selected="icn_rounded-text-field.tga" |
11 | image_hover_unselected="icn_rounded-text-field.tga" | 11 | image_hover_unselected="icn_rounded-text-field.tga" |
12 | image_selected="icn_rounded-text-field.tga" | 12 | image_selected="icn_rounded-text-field.tga" |
13 | image_unselected="icn_rounded-text-field.tga" label="" left_delta="23" | 13 | image_unselected="icn_rounded-text-field.tga" label="" left_delta="23" |
14 | name="voice_channel_bg" scale_image="true" width="102" /> | 14 | name="voice_channel_bg" scale_image="true" width="102" /> |
15 | <icon bottom="-18" height="16" image_name="icn_voice-localchat.tga" label="" | 15 | <icon bottom="-18" height="16" image_name="icn_voice-localchat.tga" label="" |
16 | left_delta="4" mouse_opaque="false" name="voice_channel_icon" width="16" /> | 16 | left_delta="4" mouse_opaque="false" name="voice_channel_icon" width="16" /> |
17 | <text bottom="-19" font="SansSerifSmall" height="16" label="" left_delta="18" | 17 | <text bottom="-19" font="SansSerifSmall" height="16" label="" left_delta="18" |
18 | mouse_opaque="false" name="channel_label" text_color="0 0 0" width="65" /> | 18 | mouse_opaque="false" name="channel_label" text_color="0 0 0" width="65" /> |
19 | <panel bottom="13" filename="panel_voice_controls.xml" left="1" /> | 19 | <panel bottom="13" filename="panel_voice_controls.xml" left="1" /> |
20 | </panel> | 20 | </panel> |