diff options
author | Jacek Antonelli | 2009-01-26 22:19:37 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-26 22:19:37 -0600 |
commit | a60f397cdc5769c49f5cfaa0a3c1fbbbe6b73d61 (patch) | |
tree | e091ddfb6911a9952e827684792f834ff063e77c /linden/indra/newview/skins/default/xui | |
parent | VWR-508/VWR-2199: Create "Worn Items" tab in Inventory (diff) | |
parent | Merge branch 'scriptcommentfix' into 1.1.0-RC1 (diff) | |
download | meta-impy-a60f397cdc5769c49f5cfaa0a3c1fbbbe6b73d61.zip meta-impy-a60f397cdc5769c49f5cfaa0a3c1fbbbe6b73d61.tar.gz meta-impy-a60f397cdc5769c49f5cfaa0a3c1fbbbe6b73d61.tar.bz2 meta-impy-a60f397cdc5769c49f5cfaa0a3c1fbbbe6b73d61.tar.xz |
Merge commit 'mccabe/1.1.0-RC1' into next
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
15 files changed, 103 insertions, 215 deletions
diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml deleted file mode 100644 index 5d5877e..0000000 --- a/linden/indra/newview/skins/default/xui/de/floater_html.xml +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <floater name="htmlfloater" title=""> | ||
3 | <button label="Schließen" name="close_btn" /> | ||
4 | <button label="Zurück" name="back_btn" /> | ||
5 | <button label="Zuhause" name="home_btn" /> | ||
6 | <button label="Weiterleiten" name="forward_btn" /> | ||
7 | <button label="Los" name="go_btn" /> | ||
8 | <string name="home_page_url"> | ||
9 | http://de.secondlife.com | ||
10 | </string> | ||
11 | <string name="support_page_url"> | ||
12 | http://de.secondlife.com/support | ||
13 | </string> | ||
14 | </floater> | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml index dc9b5ea..d3b15c5 100644 --- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml +++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml | |||
@@ -404,6 +404,8 @@ Go to the Second Life web site for more information on partnering? | |||
404 | SKW -- Skew | 404 | SKW -- Skew |
405 | PB -- Slice/Dimple/Profile cut begin | 405 | PB -- Slice/Dimple/Profile cut begin |
406 | PE -- Slice/Dimple/Profile cut end | 406 | PE -- Slice/Dimple/Profile cut end |
407 | TB -- Twist begin | ||
408 | TE -- Twist end | ||
407 | XSH -- X-axis top shear | 409 | XSH -- X-axis top shear |
408 | YSH -- Y-axis top shear | 410 | YSH -- Y-axis top shear |
409 | XHL -- X-axis hole size | 411 | XHL -- X-axis hole size |
@@ -413,17 +415,21 @@ Go to the Second Life web site for more information on partnering? | |||
413 | ROF -- Radius offset | 415 | ROF -- Radius offset |
414 | REV -- Revolutions | 416 | REV -- Revolutions |
415 | 417 | ||
418 | PI -- pi | ||
419 | TWO_PI -- 2pi | ||
420 | PI_BY_TWO -- pi/2 | ||
421 | SQRT2 -- Square root of 2 | ||
422 | DEG_TO_RAD -- DEG_TO_RAD conversion (pi/180) | ||
423 | RAD_TO_DEG -- RAD_TO_DEG conversion (180/pi) | ||
424 | GRAVITY -- -9.8 | ||
425 | |||
416 | * -- Multiplication | 426 | * -- Multiplication |
417 | \ -- Division | 427 | \ -- Division |
418 | + -- Addition | 428 | + -- Addition |
419 | - -- Subtraction | 429 | - -- Subtraction |
420 | 430 | ||
421 | Examples: | 431 | For what these are and how to use them, read: |
422 | 432 | http://imprudenceviewer.org/wiki/Build_Math_Expressions | |
423 | * Enter 'ZP + 20' in the Z-axis position field | ||
424 | to move an object up 20 meters. | ||
425 | * Enter 'XS - YS' in the X-axis size field | ||
426 | to subtract the Y size from the X size. | ||
427 | </message> | 433 | </message> |
428 | </alert> | 434 | </alert> |
429 | <alert modal="true" name="ClickTextureConstants"> | 435 | <alert modal="true" name="ClickTextureConstants"> |
@@ -443,16 +449,11 @@ Go to the Second Life web site for more information on partnering? | |||
443 | + -- Addition | 449 | + -- Addition |
444 | - -- Subtraction | 450 | - -- Subtraction |
445 | 451 | ||
446 | Examples: | 452 | For what these are and how to use them, read: |
447 | 453 | http://imprudenceviewer.org/wiki/Build_Math_Expressions | |
448 | * Enter 'TSU * 4' in horizantal repeats field | ||
449 | to increase the amount of repeats by 4x. | ||
450 | * Enter 'TSV' in the horizontal repeats field | ||
451 | to make the horizontal and vertical | ||
452 | repeats match. | ||
453 | </message> | 454 | </message> |
454 | </alert> | 455 | </alert> |
455 | <alert modal="true" name="ClickWebProfileHelpAvatar"> | 456 | <alert modal="true" name="ClickWebProfileHelpAvatar"> |
456 | <message name="message"> | 457 | <message name="message"> |
457 | If this Resident has set a web profile URL then you can: | 458 | If this Resident has set a web profile URL then you can: |
458 | * Click 'Load' to see the page in this Web tab. | 459 | * Click 'Load' to see the page in this Web tab. |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml index 6bd4424..a12cb2b 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml | |||
@@ -46,13 +46,15 @@ | |||
46 | bottom="28" embedded_items="false" enabled="false" | 46 | bottom="28" embedded_items="false" enabled="false" |
47 | follows="left|top|right|bottom" font="SansSerif" height="74" left="5" | 47 | follows="left|top|right|bottom" font="SansSerif" height="74" left="5" |
48 | max_length="2147483647" mouse_opaque="true" name="Chat History Editor" | 48 | max_length="2147483647" mouse_opaque="true" name="Chat History Editor" |
49 | track_bottom="true" | ||
49 | text_color="ChatHistoryTextColor" | 50 | text_color="ChatHistoryTextColor" |
50 | text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" /> | 51 | text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" /> |
51 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" | 52 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" |
52 | bottom="28" embedded_items="false" enabled="false" | 53 | bottom="28" embedded_items="false" enabled="false" |
53 | follows="left|top|right|bottom" font="SansSerif" height="74" left="5" | 54 | follows="left|top|right|bottom" font="SansSerif" height="74" left="5" |
54 | max_length="2147483647" mouse_opaque="true" | 55 | max_length="2147483647" mouse_opaque="true" |
55 | name="Chat History Editor with mute" text_color="ChatHistoryTextColor" | 56 | name="Chat History Editor with mute" text_color="ChatHistoryTextColor" |
57 | track_bottom="true" | ||
56 | text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" /> | 58 | text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" /> |
57 | <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5" | 59 | <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5" |
58 | tab_group="1" top="25"> | 60 | tab_group="1" top="25"> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml deleted file mode 100644 index d107454..0000000 --- a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
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" | ||
3 | height="500" min_height="300" min_width="400" name="htmlfloater" title="" | ||
4 | width="700"> | ||
5 | <button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20" | ||
6 | label="Close" name="close_btn" right="-10" width="80" /> | ||
7 | <web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15" | ||
8 | name="html_floater_browser" right="-15" top="-56" /> | ||
9 | <button bottom="-45" follows="top|left" font="SansSerifSmall" height="20" label="Back" | ||
10 | left="15" name="back_btn" width="70" /> | ||
11 | <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20" | ||
12 | label="Forward" left_delta="73" name="forward_btn" width="70" /> | ||
13 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" | ||
14 | follows="top|left|right" font="SansSerifSmall" height="20" left_delta="85" | ||
15 | max_length="256" mouse_opaque="true" name="url_edit" | ||
16 | select_all_on_focus_received="true" width="435" /> | ||
17 | <button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20" | ||
18 | label="Go" left_delta="440" name="go_btn" width="70" /> | ||
19 | <string name="home_page_url"> | ||
20 | http://www.secondlife.com | ||
21 | </string> | ||
22 | <string name="support_page_url"> | ||
23 | http://support.secondlife.com | ||
24 | </string> | ||
25 | </floater> | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml index eb8e672..3b1c927 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml | |||
@@ -64,6 +64,7 @@ | |||
64 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" | 64 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" |
65 | max_length="2147483647" mouse_opaque="true" name="im_history" | 65 | max_length="2147483647" mouse_opaque="true" name="im_history" |
66 | text_color="ChatHistoryTextColor" | 66 | text_color="ChatHistoryTextColor" |
67 | track_bottom="true" | ||
67 | text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" /> | 68 | text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" /> |
68 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" | 69 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" |
69 | follows="left|right|bottom" font="SansSerif" height="20" | 70 | follows="left|right|bottom" font="SansSerif" height="20" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml index eea285c..ddf344d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml | |||
@@ -1,73 +1,74 @@ | |||
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="-298" can_close="true" can_drag_on_left="false" | 2 | <floater border="true" bottom="-298" can_close="true" can_drag_on_left="false" |
3 | can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" | 3 | can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" |
4 | follows="left|top|right|bottom" height="297" label="(unknown)" left="1" | 4 | follows="left|top|right|bottom" height="297" label="(unknown)" left="1" |
5 | min_height="225" min_width="265" mouse_opaque="true" name="im_floater" | 5 | min_height="225" min_width="265" mouse_opaque="true" name="im_floater" |
6 | rect_control="" title="(unknown)" width="501"> | 6 | rect_control="" title="(unknown)" width="501"> |
7 | <string name="ringing"> | 7 | <string name="ringing"> |
8 | Joining Voice Chat... | 8 | Joining Voice Chat... |
9 | </string> | 9 | </string> |
10 | <string name="connected"> | 10 | <string name="connected"> |
11 | Connected, click End Call to hang up | 11 | Connected, click End Call to hang up |
12 | </string> | 12 | </string> |
13 | <string name="hang_up"> | 13 | <string name="hang_up"> |
14 | Left Voice Chat | 14 | Left Voice Chat |
15 | </string> | 15 | </string> |
16 | <string name="voice_icon"> | 16 | <string name="voice_icon"> |
17 | icn_voice-groupfocus.tga | 17 | icn_voice-groupfocus.tga |
18 | </string> | 18 | </string> |
19 | <string name="title_string"> | 19 | <string name="title_string"> |
20 | Instant Message with [NAME] | 20 | Instant Message with [NAME] |
21 | </string> | 21 | </string> |
22 | <string name="typing_start_string"> | 22 | <string name="typing_start_string"> |
23 | [NAME] is typing... | 23 | [NAME] is typing... |
24 | </string> | 24 | </string> |
25 | <string name="session_start_string"> | 25 | <string name="session_start_string"> |
26 | Starting session with [NAME] please wait. | 26 | Starting session with [NAME] please wait. |
27 | </string> | 27 | </string> |
28 | <string name="default_text_label"> | 28 | <string name="default_text_label"> |
29 | Click here to instant message. | 29 | Click here to instant message. |
30 | </string> | 30 | </string> |
31 | <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="2" | 31 | <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="2" |
32 | orientation="horizontal" tab_group="1" width="495" name="panels"> | 32 | orientation="horizontal" tab_group="1" width="495" name="panels"> |
33 | <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" | 33 | <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" |
34 | height="295" left="0" min_width="115" name="im_contents_panel" width="495"> | 34 | height="295" left="0" min_width="115" name="im_contents_panel" width="495"> |
35 | <button bottom="-20" enabled="false" follows="left|top" halign="center" height="20" | 35 | <button bottom="-20" enabled="false" follows="left|top" halign="center" height="20" |
36 | image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" | 36 | image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" |
37 | label="Call" left="5" name="start_call_btn" width="80" /> | 37 | label="Call" left="5" name="start_call_btn" width="80" /> |
38 | <button bottom_delta="0" follows="left|top" halign="center" height="20" | 38 | <button bottom_delta="0" follows="left|top" halign="center" height="20" |
39 | image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" | 39 | image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" |
40 | label="End Call" left_delta="0" name="end_call_btn" visible="false" | 40 | label="End Call" left_delta="0" name="end_call_btn" visible="false" |
41 | width="80" /> | 41 | width="80" /> |
42 | <button bottom_delta="0" follows="right|top" height="20" label="< <" | 42 | <button bottom_delta="0" follows="right|top" height="20" label="< <" |
43 | label_selected="> >" left="463" name="toggle_active_speakers_btn" | 43 | label_selected="> >" left="463" name="toggle_active_speakers_btn" |
44 | right="496" | 44 | right="496" |
45 | tool_tip="Click here to toggle a list of active participants in this IM session." | 45 | tool_tip="Click here to toggle a list of active participants in this IM session." |
46 | visible="true" width="80" /> | 46 | visible="true" width="80" /> |
47 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" | 47 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" |
48 | bottom="-265" embedded_items="false" enabled="false" | 48 | bottom="-265" embedded_items="false" enabled="false" |
49 | follows="left|top|right|bottom" font="SansSerif" height="239" left="5" | 49 | follows="left|top|right|bottom" font="SansSerif" height="239" left="5" |
50 | max_length="2147483647" mouse_opaque="true" name="im_history" | 50 | max_length="2147483647" mouse_opaque="true" name="im_history" |
51 | text_color="ChatHistoryTextColor" | 51 | track_bottom="true" |
52 | text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" /> | 52 | text_color="ChatHistoryTextColor" |
53 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" | 53 | text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" /> |
54 | enabled="true" follows="left|right|bottom" font="SansSerif" | 54 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" |
55 | handle_edit_keys_directly="false" height="20" | 55 | enabled="true" follows="left|right|bottom" font="SansSerif" |
56 | label="Click here to instant message" left="5" max_length="1022" | 56 | handle_edit_keys_directly="false" height="20" |
57 | mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false" | 57 | label="Click here to instant message" left="5" max_length="1022" |
58 | select_on_focus="false" tab_group="1" width="426" /> | 58 | mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false" |
59 | <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif" | 59 | select_on_focus="false" tab_group="1" width="426" /> |
60 | halign="center" height="20" label="Send" left="436" mouse_opaque="true" | 60 | <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif" |
61 | name="send_btn" scale_image="true" width="60" /> | 61 | halign="center" height="20" label="Send" left="436" mouse_opaque="true" |
62 | </layout_panel> | 62 | name="send_btn" scale_image="true" width="60" /> |
63 | <layout_panel auto_resize="false" bottom="0" can_resize="true" | 63 | </layout_panel> |
64 | filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" | 64 | <layout_panel auto_resize="false" bottom="0" can_resize="true" |
65 | name="active_speakers_panel" top_delta="0" visible="false" width="140" /> | 65 | filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" |
66 | </layout_stack> | 66 | name="active_speakers_panel" top_delta="0" visible="false" width="140" /> |
67 | <string name="live_help_dialog"> | 67 | </layout_stack> |
68 | *** Welcome to Help Request *** | 68 | <string name="live_help_dialog"> |
69 | Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ | 69 | *** Welcome to Help Request *** |
70 | If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond. | 70 | Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ |
71 | -=-=- Response times will vary, especially during peak times -=-=- | 71 | If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond. |
72 | </string> | 72 | -=-=- Response times will vary, especially during peak times -=-=- |
73 | </floater> | 73 | </string> |
74 | </floater> | ||
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml index 3a6e4ec..f59017e 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml | |||
@@ -64,6 +64,7 @@ | |||
64 | follows="left|top|right|bottom" font="SansSerif" left="4" | 64 | follows="left|top|right|bottom" font="SansSerif" left="4" |
65 | max_length="2147483647" mouse_opaque="true" name="im_history" | 65 | max_length="2147483647" mouse_opaque="true" name="im_history" |
66 | text_color="ChatHistoryTextColor" | 66 | text_color="ChatHistoryTextColor" |
67 | track_bottom="true" | ||
67 | text_readonly_color="ChatHistoryTextColor" top="104" width="170" | 68 | text_readonly_color="ChatHistoryTextColor" top="104" width="170" |
68 | word_wrap="true" /> | 69 | word_wrap="true" /> |
69 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" | 70 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml index 077ab23..318f46a 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml | |||
@@ -8,15 +8,15 @@ | |||
8 | <button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back" | 8 | <button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back" |
9 | width="55" /> | 9 | width="55" /> |
10 | <button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55" | 10 | <button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55" |
11 | name="forward" width="60" /> | 11 | name="forward" width="68" /> |
12 | <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload" | 12 | <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload" |
13 | left_delta="65" name="reload" width="70" /> | 13 | left_delta="70" name="reload" width="70" /> |
14 | <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20" | 14 | <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20" |
15 | left_delta="75" max_chars="235" name="address" width="225" /> | 15 | left_delta="75" max_chars="235" name="address" width="230" /> |
16 | <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go" | 16 | <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go" |
17 | left_delta="230" name="go" width="55" /> | 17 | left_delta="232" name="go" width="55" /> |
18 | <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home" | 18 | <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home" |
19 | left_delta="60" name="home" width="55" /> | 19 | left_delta="58" name="home" width="55" /> |
20 | </layout_panel> | 20 | </layout_panel> |
21 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" | 21 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" |
22 | name="parcel_owner_controls" user_resize="false" width="540"> | 22 | name="parcel_owner_controls" user_resize="false" width="540"> |
@@ -30,10 +30,10 @@ | |||
30 | <button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser" | 30 | <button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser" |
31 | left="0" name="open_browser" width="185" /> | 31 | left="0" name="open_browser" width="185" /> |
32 | <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20" | 32 | <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20" |
33 | label="Always open in my web browser" left_delta="190" name="open_always" | 33 | label="Always open in my web browser" left_delta="184" name="open_always" |
34 | width="200" /> | 34 | width="200" /> |
35 | <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set Home To Here" | 35 | <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set As Home" |
36 | left="-265" name="set_home" width="155" /> | 36 | left="-176" name="set_home" width="104" /> |
37 | <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70" | 37 | <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70" |
38 | name="close" width="70" /> | 38 | name="close" width="70" /> |
39 | </layout_panel> | 39 | </layout_panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml index ecacc78..5808e71 100644 --- a/linden/indra/newview/skins/default/xui/en-us/strings.xml +++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml | |||
@@ -178,6 +178,7 @@ | |||
178 | 178 | ||
179 | <!-- System messages --> | 179 | <!-- System messages --> |
180 | <string name="landmark_created">You created a landmark at</string> | 180 | <string name="landmark_created">You created a landmark at</string> |
181 | <string name="new_home_page">Your new Home Page is</string> | ||
181 | 182 | ||
182 | </strings> | 183 | </strings> |
183 | 184 | ||
diff --git a/linden/indra/newview/skins/default/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml deleted file mode 100644 index 9985276..0000000 --- a/linden/indra/newview/skins/default/xui/es/floater_html.xml +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <floater name="htmlfloater" title=""> | ||
3 | <button label="Volver" name="back_btn" /> | ||
4 | <button label="Avanzar" name="forward_btn" /> | ||
5 | <button label="Recargar" name="reload_btn" /> | ||
6 | <button label="Parar" name="stop_btn" /> | ||
7 | <button label="Casa" name="home_btn" /> | ||
8 | <button label="Ir" name="go_btn" /> | ||
9 | <string name="support_page_url"> | ||
10 | http://secondlife.com/app/support/index_es.html | ||
11 | </string> | ||
12 | </floater> | ||
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml deleted file mode 100644 index 9504040..0000000 --- a/linden/indra/newview/skins/default/xui/fr/floater_html.xml +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <floater name="htmlfloater" title=""> | ||
3 | <button label="Fermer" name="close_btn" /> | ||
4 | <button label="Précédente" name="back_btn" /> | ||
5 | <button label="Suivante" name="forward_btn" /> | ||
6 | <button label="Recharger" name="reload_btn" /> | ||
7 | <button label="Arrêter" name="stop_btn" /> | ||
8 | <button label="Domicile" name="home_btn" /> | ||
9 | <button label="Aller" name="go_btn" /> | ||
10 | <string name="home_page_url"> | ||
11 | http://www.secondlife.com | ||
12 | </string> | ||
13 | <string name="support_page_url"> | ||
14 | http://support.secondlife.com | ||
15 | </string> | ||
16 | </floater> | ||
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_html.xml b/linden/indra/newview/skins/default/xui/ja/floater_html.xml deleted file mode 100644 index da63fab..0000000 --- a/linden/indra/newview/skins/default/xui/ja/floater_html.xml +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <floater name="htmlfloater" title=""> | ||
3 | <button label="閉じる" name="close_btn" /> | ||
4 | <button label="戻る" name="back_btn" /> | ||
5 | <button label="ホーム" name="home_btn" /> | ||
6 | <button label="進む" name="forward_btn" /> | ||
7 | <button label="移動" name="go_btn" /> | ||
8 | <string name="home_page_url"> | ||
9 | http://jp.secondlife.com | ||
10 | </string> | ||
11 | <string name="support_page_url"> | ||
12 | http://help.secondlife.com/jp | ||
13 | </string> | ||
14 | </floater> | ||
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_html.xml b/linden/indra/newview/skins/default/xui/ko/floater_html.xml deleted file mode 100644 index c4c2055..0000000 --- a/linden/indra/newview/skins/default/xui/ko/floater_html.xml +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <floater name="htmlfloater" title=""> | ||
3 | <button label="닫기" name="close_btn" /> | ||
4 | <button label="뒤로" name="back_btn" /> | ||
5 | <button label="홈" name="home_btn" /> | ||
6 | <button label="앞으로" name="forward_btn" /> | ||
7 | <button label="이동" name="go_btn" /> | ||
8 | <string name="home_page_url"> | ||
9 | http://kr.secondlife.com | ||
10 | </string> | ||
11 | <string name="support_page_url"> | ||
12 | http://help.secondlife.com/kr | ||
13 | </string> | ||
14 | </floater> | ||
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_html.xml b/linden/indra/newview/skins/default/xui/pt/floater_html.xml deleted file mode 100644 index b64cb2d..0000000 --- a/linden/indra/newview/skins/default/xui/pt/floater_html.xml +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <floater name="htmlfloater" title=""> | ||
3 | <text name="f1_help_title"> | ||
4 | Second Life Help | ||
5 | </text> | ||
6 | <text name="f1_help_url"> | ||
7 | http://secondlife.com/app/support/index_pt.html | ||
8 | </text> | ||
9 | <string name="support_page_url"> | ||
10 | http://secondlife.com/app/support/index_pt.html | ||
11 | </string> | ||
12 | </floater> | ||
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_html.xml b/linden/indra/newview/skins/default/xui/zh/floater_html.xml deleted file mode 100644 index 8c75fa7..0000000 --- a/linden/indra/newview/skins/default/xui/zh/floater_html.xml +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <floater name="htmlfloater" title=""> | ||
3 | <button label="返回" name="back_btn" /> | ||
4 | <button label="朝向" name="forward_btn" /> | ||
5 | <button label="重载入" name="reload_btn" /> | ||
6 | <button label="停止" name="stop_btn" /> | ||
7 | <button label="家" name="home_btn" /> | ||
8 | <button label="行动" name="go_btn" /> | ||
9 | <string name="support_page_url"> | ||
10 | http://secondlife.com/app/support/index_zh.html | ||
11 | </string> | ||
12 | </floater> | ||