diff options
Diffstat (limited to 'linden/indra/newview/skins')
13 files changed, 430 insertions, 349 deletions
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 c2d4301..dc9b5ea 100644 --- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml +++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml | |||
@@ -385,6 +385,73 @@ Go to the Second Life web site for more information on partnering? | |||
385 | Cancel | 385 | Cancel |
386 | </option> | 386 | </option> |
387 | </alert> | 387 | </alert> |
388 | <alert modal="true" name="ClickBuildConstants"> | ||
389 | <message name="message"> | ||
390 | The following constants are accepted in this tab: | ||
391 | |||
392 | XP -- X-axis position | ||
393 | YP -- Y-axis position | ||
394 | ZP -- Z-axis position | ||
395 | XS -- X-axis size | ||
396 | YS -- Y-axis size | ||
397 | ZS -- Z-axis size | ||
398 | XR -- X-axis rotation | ||
399 | YR -- Y-axis rotation | ||
400 | ZR -- Z-axis rotation | ||
401 | CB -- Path cut begin | ||
402 | CE -- Path cut end | ||
403 | HLW -- Hollow size | ||
404 | SKW -- Skew | ||
405 | PB -- Slice/Dimple/Profile cut begin | ||
406 | PE -- Slice/Dimple/Profile cut end | ||
407 | XSH -- X-axis top shear | ||
408 | YSH -- Y-axis top shear | ||
409 | XHL -- X-axis hole size | ||
410 | YHL -- Y-axis hole size | ||
411 | XTP -- X-axis taper | ||
412 | YTP -- Y-axis taper | ||
413 | ROF -- Radius offset | ||
414 | REV -- Revolutions | ||
415 | |||
416 | * -- Multiplication | ||
417 | \ -- Division | ||
418 | + -- Addition | ||
419 | - -- Subtraction | ||
420 | |||
421 | Examples: | ||
422 | |||
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> | ||
428 | </alert> | ||
429 | <alert modal="true" name="ClickTextureConstants"> | ||
430 | <message name="message"> | ||
431 | The following constants are accepted in this tab: | ||
432 | |||
433 | TSU -- Repeats per face (horizontal) | ||
434 | TSV -- Repeats per face (vertical) | ||
435 | TOU -- Offsets per face (horizontal) | ||
436 | TOV -- Offsets per face (vertical) | ||
437 | TRNS -- Transparency | ||
438 | TROT -- Texture rotation | ||
439 | GLOW -- Glow | ||
440 | |||
441 | * -- Multiplication | ||
442 | \ -- Division | ||
443 | + -- Addition | ||
444 | - -- Subtraction | ||
445 | |||
446 | Examples: | ||
447 | |||
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 | </alert> | ||
388 | <alert modal="true" name="ClickWebProfileHelpAvatar"> | 455 | <alert modal="true" name="ClickWebProfileHelpAvatar"> |
389 | <message name="message"> | 456 | <message name="message"> |
390 | If this Resident has set a web profile URL then you can: | 457 | If this Resident has set a web profile URL then you can: |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml index 0c60090..c2eb3c2 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml | |||
@@ -139,6 +139,8 @@ | |||
139 | <slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15" | 139 | <slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15" |
140 | increment="1" initial_val="75" label="Image Quality" left="10" | 140 | increment="1" initial_val="75" label="Image Quality" left="10" |
141 | max_val="100" min_val="0" name="image_quality_slider" width="210" /> | 141 | max_val="100" min_val="0" name="image_quality_slider" width="210" /> |
142 | <check_box bottom_delta="0" follows="left|top" label="High resolution snapshot" | ||
143 | left="10" name="high_res_check" /> | ||
142 | <text bottom_delta="-28" follows="left|top" height="20" left="10" | 144 | <text bottom_delta="-28" follows="left|top" height="20" left="10" |
143 | name="layer_type_label" width="50"> | 145 | name="layer_type_label" width="50"> |
144 | Capture: | 146 | Capture: |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml index 742da45..eb9b1c6 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | |||
@@ -587,7 +587,10 @@ | |||
587 | mouse_opaque="true" name="edit_object" v_pad="0" width="252"> | 587 | mouse_opaque="true" name="edit_object" v_pad="0" width="252"> |
588 | Edit object parameters: | 588 | Edit object parameters: |
589 | </text> | 589 | </text> |
590 | <check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16" | 590 | <button bottom_delta="-10" follows="left|top" font="SansSerif" halign="center" |
591 | height="22" label="?" label_selected="?" right="-8" tool_tip="Object math constants" | ||
592 | mouse_opaque="true" name="build_math_constants" scale_image="true" width="22" /> | ||
593 | <check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16" | ||
591 | initial_value="false" label="Locked" left="8" mouse_opaque="true" | 594 | initial_value="false" label="Locked" left="8" mouse_opaque="true" |
592 | name="checkbox locked" | 595 | name="checkbox locked" |
593 | tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits." | 596 | tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits." |
@@ -614,15 +617,15 @@ | |||
614 | <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16" | 617 | <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16" |
615 | increment="0.01" initial_val="0" label="X" label_width="10" left="10" | 618 | increment="0.01" initial_val="0" label="X" label_width="10" left="10" |
616 | max_val="512" min_val="-256" mouse_opaque="true" name="Pos X" | 619 | max_val="512" min_val="-256" mouse_opaque="true" name="Pos X" |
617 | text_enabled_color="110, 15, 15, 255" width="87" /> | 620 | text_enabled_color="110, 15, 15, 255" width="96" /> |
618 | <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" | 621 | <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" |
619 | increment="0.01" initial_val="0" label="Y" label_width="10" left="10" | 622 | increment="0.01" initial_val="0" label="Y" label_width="10" left="10" |
620 | max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y" | 623 | max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y" |
621 | text_enabled_color="0, 100, 40, 255" width="87" /> | 624 | text_enabled_color="0, 100, 40, 255" width="96" /> |
622 | <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" | 625 | <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" |
623 | increment="0.01" initial_val="0" label="Z" label_width="10" left="10" | 626 | increment="0.01" initial_val="0" label="Z" label_width="10" left="10" |
624 | max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z" | 627 | max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z" |
625 | text_enabled_color="0, 67, 132, 255" width="87" /> | 628 | text_enabled_color="0, 67, 132, 255" width="96" /> |
626 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 629 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
627 | bottom_delta="-16" drop_shadow_visible="true" follows="left|top" | 630 | bottom_delta="-16" drop_shadow_visible="true" follows="left|top" |
628 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" | 631 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" |
@@ -632,15 +635,15 @@ | |||
632 | <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16" | 635 | <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16" |
633 | increment="0.01" initial_val="0" label="X" label_width="10" left="10" | 636 | increment="0.01" initial_val="0" label="X" label_width="10" left="10" |
634 | max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X" | 637 | max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X" |
635 | text_enabled_color="1, 1, 1, 1" width="87" /> | 638 | text_enabled_color="1, 1, 1, 1" width="96" /> |
636 | <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" | 639 | <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" |
637 | increment="0.01" initial_val="0" label="Y" label_width="10" left="10" | 640 | increment="0.01" initial_val="0" label="Y" label_width="10" left="10" |
638 | max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y" | 641 | max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y" |
639 | text_enabled_color="1, 1, 1, 1" width="87" /> | 642 | text_enabled_color="1, 1, 1, 1" width="96" /> |
640 | <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" | 643 | <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16" |
641 | increment="0.01" initial_val="0" label="Z" label_width="10" left="10" | 644 | increment="0.01" initial_val="0" label="Z" label_width="10" left="10" |
642 | max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z" | 645 | max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z" |
643 | text_enabled_color="1, 1, 1, 1" width="87" /> | 646 | text_enabled_color="1, 1, 1, 1" width="96" /> |
644 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 647 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
645 | bottom_delta="-16" drop_shadow_visible="true" follows="left|top" | 648 | bottom_delta="-16" drop_shadow_visible="true" follows="left|top" |
646 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" | 649 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" |
@@ -650,15 +653,15 @@ | |||
650 | <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16" | 653 | <spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16" |
651 | increment="1" initial_val="0" label="X" label_width="10" left="10" | 654 | increment="1" initial_val="0" label="X" label_width="10" left="10" |
652 | max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X" | 655 | max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X" |
653 | text_enabled_color="1, 1, 1, 1" width="87" /> | 656 | text_enabled_color="1, 1, 1, 1" width="96" /> |
654 | <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16" | 657 | <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16" |
655 | increment="1" initial_val="0" label="Y" label_width="10" left="10" | 658 | increment="1" initial_val="0" label="Y" label_width="10" left="10" |
656 | max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y" | 659 | max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y" |
657 | text_enabled_color="1, 1, 1, 1" width="87" /> | 660 | text_enabled_color="1, 1, 1, 1" width="96" /> |
658 | <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16" | 661 | <spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16" |
659 | increment="1" initial_val="0" label="Z" label_width="10" left="10" | 662 | increment="1" initial_val="0" label="Z" label_width="10" left="10" |
660 | max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z" | 663 | max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z" |
661 | text_enabled_color="1, 1, 1, 1" width="87" /> | 664 | text_enabled_color="1, 1, 1, 1" width="96" /> |
662 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 665 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
663 | bottom_delta="-16" drop_shadow_visible="true" follows="left|top" | 666 | bottom_delta="-16" drop_shadow_visible="true" follows="left|top" |
664 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" | 667 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" |
@@ -748,12 +751,12 @@ | |||
748 | Skew | 751 | Skew |
749 | </text> | 752 | </text> |
750 | <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16" | 753 | <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16" |
751 | increment="5" initial_val="0" left="121" max_val="95" min_val="0" | 754 | increment="5" initial_val="0" left="121" max_val="95" min_val="0" |
752 | mouse_opaque="true" name="Scale 1" width="68" /> | 755 | mouse_opaque="true" name="Scale 1" width="68" label=" " label_width="10"/> |
753 | <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16" | 756 | <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16" |
754 | increment="0.05" initial_val="0" left_delta="73" max_val="0.95" | 757 | increment="0.05" initial_val="0" left_delta="73" max_val="0.95" label_width="10" |
755 | min_val="-0.95" mouse_opaque="true" name="Skew" width="68" /> | 758 | min_val="-0.95" mouse_opaque="true" name="Skew" width="68" label=" " /> |
756 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 759 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
757 | bottom_delta="-15" drop_shadow_visible="true" follows="left|top" | 760 | bottom_delta="-15" drop_shadow_visible="true" follows="left|top" |
758 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121" | 761 | font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121" |
759 | mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141"> | 762 | mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141"> |
@@ -872,10 +875,10 @@ | |||
872 | </text> | 875 | </text> |
873 | <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16" | 876 | <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16" |
874 | increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1" | 877 | increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1" |
875 | mouse_opaque="true" name="Radius Offset" width="68" /> | 878 | mouse_opaque="true" name="Radius Offset" width="68" label=" " label_width="10" /> |
876 | <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16" | 879 | <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16" |
877 | increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1" | 880 | increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1" |
878 | mouse_opaque="true" name="Revolutions" width="68" /> | 881 | mouse_opaque="true" name="Revolutions" width="68" label=" " label_width="10" /> |
879 | <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true" | 882 | <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true" |
880 | default_image_name="Default" follows="left|top" height="141" | 883 | default_image_name="Default" follows="left|top" height="141" |
881 | label="Sculpt Texture" left="121" mouse_opaque="true" | 884 | label="Sculpt Texture" left="121" mouse_opaque="true" |
@@ -1018,7 +1021,7 @@ | |||
1018 | </text> | 1021 | </text> |
1019 | <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16" | 1022 | <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16" |
1020 | increment="2" initial_val="0" left="180" max_val="100" min_val="0" | 1023 | increment="2" initial_val="0" left="180" max_val="100" min_val="0" |
1021 | mouse_opaque="true" name="ColorTrans" width="80" /> | 1024 | mouse_opaque="true" name="ColorTrans" width="58" /> |
1022 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 1025 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
1023 | bottom_delta="-12" drop_shadow_visible="true" follows="left|top" | 1026 | bottom_delta="-12" drop_shadow_visible="true" follows="left|top" |
1024 | font="SansSerifSmall" h_pad="0" halign="left" height="10" | 1027 | font="SansSerifSmall" h_pad="0" halign="left" height="10" |
@@ -1027,7 +1030,7 @@ | |||
1027 | </text> | 1030 | </text> |
1028 | <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16" | 1031 | <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16" |
1029 | increment="0.1" initial_val="0" left="180" max_val="1" | 1032 | increment="0.1" initial_val="0" left="180" max_val="1" |
1030 | min_val="0" mouse_opaque="true" name="glow" width="80" /> | 1033 | min_val="0" mouse_opaque="true" name="glow" width="58" /> |
1031 | <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16" | 1034 | <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16" |
1032 | initial_value="false" label="Full Bright" left="180" mouse_opaque="true" | 1035 | initial_value="false" label="Full Bright" left="180" mouse_opaque="true" |
1033 | name="checkbox fullbright" width="81" /> | 1036 | name="checkbox fullbright" width="81" /> |
@@ -1201,6 +1204,9 @@ | |||
1201 | <button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center" | 1204 | <button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center" |
1202 | height="16" label="Align" label_selected="Align" left="112" | 1205 | height="16" label="Align" label_selected="Align" left="112" |
1203 | mouse_opaque="true" name="button align" scale_image="TRUE" width="68" /> | 1206 | mouse_opaque="true" name="button align" scale_image="TRUE" width="68" /> |
1207 | <button bottom="-162" follows="left|top" font="SansSerif" halign="center" | ||
1208 | height="22" label="?" label_selected="?" right="-8" tool_tip="Texture math constants" | ||
1209 | mouse_opaque="true" name="texture_math_constants" scale_image="true" width="24" /> | ||
1204 | </panel> | 1210 | </panel> |
1205 | <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367" | 1211 | <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367" |
1206 | label="Content" left="1" mouse_opaque="false" name="Contents" width="270"> | 1212 | label="Content" left="1" mouse_opaque="false" name="Contents" width="270"> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml index acbe4f4..d16c22c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml | |||
@@ -25,14 +25,19 @@ | |||
25 | <on_click function="Attachment.Detach" /> | 25 | <on_click function="Attachment.Detach" /> |
26 | <on_enable function="Attachment.EnableDetach" /> | 26 | <on_enable function="Attachment.EnableDetach" /> |
27 | </menu_item_call> | 27 | </menu_item_call> |
28 | <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop"> | 28 | <menu_item_separator /> |
29 | <on_click function="Attachment.Drop" /> | 29 | <menu_item_separator /> |
30 | <on_enable function="Attachment.EnableDrop" /> | 30 | <menu_item_separator /> |
31 | </menu_item_call> | 31 | <menu_item_separator /> |
32 | <menu_item_separator /> | ||
32 | <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit..."> | 33 | <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit..."> |
33 | <on_click function="Object.Edit" /> | 34 | <on_click function="Object.Edit" /> |
34 | <on_enable function="EnableEdit" /> | 35 | <on_enable function="EnableEdit" /> |
35 | </menu_item_call> | 36 | </menu_item_call> |
37 | <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop"> | ||
38 | <on_click function="Attachment.Drop" /> | ||
39 | <on_enable function="Attachment.EnableDrop" /> | ||
40 | </menu_item_call> | ||
36 | </pie_menu> | 41 | </pie_menu> |
37 | <menu_item_call enabled="true" label="Appearance..." name="Appearance..."> | 42 | <menu_item_call enabled="true" label="Appearance..." name="Appearance..."> |
38 | <on_click function="ShowFloater" userdata="appearance" /> | 43 | <on_click function="ShowFloater" userdata="appearance" /> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml index c8d8ed6..2d44dab 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml | |||
@@ -10,7 +10,9 @@ | |||
10 | <menu_item_call enabled="false" label="Go To" mouse_opaque="true" name="Go To"> | 10 | <menu_item_call enabled="false" label="Go To" mouse_opaque="true" name="Go To"> |
11 | <on_click function="GoToObject" /> | 11 | <on_click function="GoToObject" /> |
12 | </menu_item_call> | 12 | </menu_item_call> |
13 | <menu_item_separator /> | 13 | <menu_item_call enabled="false" label="Abuse..." mouse_opaque="true" name="abuse"> |
14 | <on_click function="Avatar.ReportAbuse" /> | ||
15 | </menu_item_call> | ||
14 | <menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend"> | 16 | <menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend"> |
15 | <on_click function="Avatar.AddFriend" /> | 17 | <on_click function="Avatar.AddFriend" /> |
16 | <on_enable function="Avatar.EnableAddFriend" /> | 18 | <on_enable function="Avatar.EnableAddFriend" /> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml index ee2a431..81ae04f 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml | |||
@@ -3,7 +3,7 @@ | |||
3 | <menu_item_call enabled="false" label="About Land..." mouse_opaque="true" name="About Land..."> | 3 | <menu_item_call enabled="false" label="About Land..." mouse_opaque="true" name="About Land..."> |
4 | <on_click function="ShowFloater" userdata="about land" /> | 4 | <on_click function="ShowFloater" userdata="about land" /> |
5 | </menu_item_call> | 5 | </menu_item_call> |
6 | <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create"> | 6 | <menu_item_call enabled="false" label="Build" mouse_opaque="true" name="Create"> |
7 | <on_click function="Land.Build" /> | 7 | <on_click function="Land.Build" /> |
8 | <on_enable function="EnableEdit" /> | 8 | <on_enable function="EnableEdit" /> |
9 | </menu_item_call> | 9 | </menu_item_call> |
@@ -13,7 +13,9 @@ | |||
13 | <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Sit Here"> | 13 | <menu_item_call enabled="false" label="Sit Here" mouse_opaque="true" name="Sit Here"> |
14 | <on_click function="Land.Sit" /> | 14 | <on_click function="Land.Sit" /> |
15 | </menu_item_call> | 15 | </menu_item_call> |
16 | <menu_item_separator /> | 16 | <menu_item_call enabled="false" label="Landmark..." mouse_opaque="true" name="Add Landmark"> |
17 | <on_click function="Land.NewLandmark" /> | ||
18 | </menu_item_call> | ||
17 | <menu_item_call enabled="false" label="Buy Pass..." mouse_opaque="true" name="Land Buy Pass"> | 19 | <menu_item_call enabled="false" label="Buy Pass..." mouse_opaque="true" name="Land Buy Pass"> |
18 | <on_click function="Land.BuyPass" /> | 20 | <on_click function="Land.BuyPass" /> |
19 | <on_enable function="Land.EnableBuyPass" /> | 21 | <on_enable function="Land.EnableBuyPass" /> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml index e471115..b63e007 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | |||
@@ -25,48 +25,48 @@ | |||
25 | <on_enable function="EnablePayObject" /> | 25 | <on_enable function="EnablePayObject" /> |
26 | </menu_item_call> | 26 | </menu_item_call> |
27 | <pie_menu label="More >" name="More >"> | 27 | <pie_menu label="More >" name="More >"> |
28 | <menu_item_call enabled="false" label="Delete" mouse_opaque="true" name="Delete"> | 28 | <menu_item_call enabled="false" label="Build" mouse_opaque="true" name="Create"> |
29 | <on_click function="Object.Delete" /> | 29 | <on_click function="Object.Build" /> |
30 | <on_enable function="Object.EnableDelete" /> | 30 | <on_enable function="EnableEdit" /> |
31 | </menu_item_call> | 31 | </menu_item_call> |
32 | <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear"> | 32 | <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear"> |
33 | <on_click function="Object.AttachToAvatar" /> | 33 | <on_click function="Object.AttachToAvatar" /> |
34 | <on_enable function="Object.EnableWear" /> | 34 | <on_enable function="Object.EnableWear" /> |
35 | </menu_item_call> | 35 | </menu_item_call> |
36 | <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy"> | 36 | <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy"> |
37 | <on_click function="Tools.TakeCopy" /> | 37 | <on_click function="Tools.TakeCopy" /> |
38 | <on_enable function="Tools.EnableTakeCopy" /> | 38 | <on_enable function="Tools.EnableTakeCopy" /> |
39 | </menu_item_call> | 39 | </menu_item_call> |
40 | <pie_menu label="Attach HUD >" name="Object Attach HUD" /> | 40 | <pie_menu label="Attach HUD >" name="Object Attach HUD" /> |
41 | <pie_menu label="Attach >" name="Object Attach" /> | 41 | <pie_menu label="Attach >" name="Object Attach" /> |
42 | <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return..."> | 42 | <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return..."> |
43 | <on_click function="Object.Return" /> | 43 | <on_click function="Object.Return" /> |
44 | <on_enable function="Object.EnableReturn" /> | 44 | <on_enable function="Object.EnableReturn" /> |
45 | </menu_item_call> | 45 | </menu_item_call> |
46 | <pie_menu label="More >" name="Rate Menu"> | 46 | <pie_menu label="More >" name="Rate Menu"> |
47 | <menu_item_separator /> | 47 | <menu_item_separator /> |
48 | <menu_item_separator /> | 48 | <menu_item_separator /> |
49 | <menu_item_call enabled="false" label="Report Abuse..." mouse_opaque="true" | 49 | <menu_item_call enabled="false" label="Abuse..." mouse_opaque="true" |
50 | name="Report Abuse..."> | 50 | name="Report Abuse..."> |
51 | <on_click function="Object.ReportAbuse" /> | 51 | <on_click function="Object.ReportAbuse" /> |
52 | <on_enable function="Object.EnableReportAbuse" /> | 52 | <on_enable function="Object.EnableReportAbuse" /> |
53 | </menu_item_call> | 53 | </menu_item_call> |
54 | <menu_item_separator /> | 54 | <menu_item_separator /> |
55 | <menu_item_separator /> | 55 | <menu_item_separator /> |
56 | <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute"> | 56 | <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute"> |
57 | <on_click function="Object.Mute" /> | 57 | <on_click function="Object.Mute" /> |
58 | <on_enable function="Object.EnableMute" /> | 58 | <on_enable function="Object.EnableMute" /> |
59 | </menu_item_call> | 59 | </menu_item_call> |
60 | <menu_item_separator /> | 60 | <menu_item_separator /> |
61 | <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> | 61 | <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> |
62 | <on_click function="Object.Inspect" /> | 62 | <on_click function="Object.Inspect" /> |
63 | <on_enable function="Object.EnableInspect" /> | 63 | <on_enable function="Object.EnableInspect" /> |
64 | </menu_item_call> | 64 | </menu_item_call> |
65 | </pie_menu> | 65 | </pie_menu> |
66 | <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create"> | 66 | <menu_item_call enabled="false" label="Delete" mouse_opaque="true" name="Delete"> |
67 | <on_click function="Object.Build" /> | 67 | <on_click function="Object.Delete" /> |
68 | <on_enable function="EnableEdit" /> | 68 | <on_enable function="Object.EnableDelete" /> |
69 | </menu_item_call> | 69 | </menu_item_call> |
70 | </pie_menu> | 70 | </pie_menu> |
71 | <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit..."> | 71 | <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit..."> |
72 | <on_click function="Object.Edit" /> | 72 | <on_click function="Object.Edit" /> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml index 1a6c66c..4fb7262 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml | |||
@@ -6,83 +6,85 @@ | |||
6 | <menu_item_call enabled="true" label="Groups..." name="Groups..."> | 6 | <menu_item_call enabled="true" label="Groups..." name="Groups..."> |
7 | <on_click function="ShowAgentGroups" userdata="agent" /> | 7 | <on_click function="ShowAgentGroups" userdata="agent" /> |
8 | </menu_item_call> | 8 | </menu_item_call> |
9 | <pie_menu enabled="true" label="Take Off >" name="Take Off >"> | 9 | <menu_item_call enabled="true" label="Inventory" name="Inventory"> |
10 | <pie_menu enabled="true" label="Clothes >" name="Clothes >"> | 10 | <on_click function="ShowFloater" userdata="inventory" /> |
11 | <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0" | 11 | </menu_item_call> |
12 | <menu_item_call enabled="true" label="Stand Up" name="Stand Up"> | ||
13 | <on_click function="Self.StandUp" userdata="" /> | ||
14 | <on_enable function="Self.EnableStandUp" /> | ||
15 | </menu_item_call> | ||
16 | <menu_item_call enabled="true" label="Friends..." name="Friends..."> | ||
17 | <on_click function="ShowFloater" userdata="friends" /> | ||
18 | </menu_item_call> | ||
19 | <menu_item_call enabled="true" label="Gestures..." name="Gestures..."> | ||
20 | <on_click function="ShowFloater" userdata="gestures" /> | ||
21 | </menu_item_call> | ||
22 | <pie_menu enabled="true" label="Take Off >" name="Take Off >"> | ||
23 | <pie_menu enabled="true" label="Clothes >" name="Clothes >"> | ||
24 | <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0" | ||
12 | mouse_opaque="true" name="Shirt" width="118"> | 25 | mouse_opaque="true" name="Shirt" width="118"> |
13 | <on_click function="Edit.TakeOff" userdata="shirt" /> | 26 | <on_click function="Edit.TakeOff" userdata="shirt" /> |
14 | <on_enable function="Edit.EnableTakeOff" userdata="shirt" /> | 27 | <on_enable function="Edit.EnableTakeOff" userdata="shirt" /> |
15 | </menu_item_call> | 28 | </menu_item_call> |
16 | <menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0" | 29 | <menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0" |
17 | mouse_opaque="true" name="Pants" width="118"> | 30 | mouse_opaque="true" name="Pants" width="118"> |
18 | <on_click function="Edit.TakeOff" userdata="pants" /> | 31 | <on_click function="Edit.TakeOff" userdata="pants" /> |
19 | <on_enable function="Edit.EnableTakeOff" userdata="pants" /> | 32 | <on_enable function="Edit.EnableTakeOff" userdata="pants" /> |
20 | </menu_item_call> | 33 | </menu_item_call> |
21 | <menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0" | 34 | <menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0" |
22 | mouse_opaque="true" name="Shoes" width="118"> | 35 | mouse_opaque="true" name="Shoes" width="118"> |
23 | <on_click function="Edit.TakeOff" userdata="shoes" /> | 36 | <on_click function="Edit.TakeOff" userdata="shoes" /> |
24 | <on_enable function="Edit.EnableTakeOff" userdata="shoes" /> | 37 | <on_enable function="Edit.EnableTakeOff" userdata="shoes" /> |
25 | </menu_item_call> | 38 | </menu_item_call> |
26 | <menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0" | 39 | <menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0" |
27 | mouse_opaque="true" name="Socks" width="118"> | 40 | mouse_opaque="true" name="Socks" width="118"> |
28 | <on_click function="Edit.TakeOff" userdata="socks" /> | 41 | <on_click function="Edit.TakeOff" userdata="socks" /> |
29 | <on_enable function="Edit.EnableTakeOff" userdata="socks" /> | 42 | <on_enable function="Edit.EnableTakeOff" userdata="socks" /> |
30 | </menu_item_call> | 43 | </menu_item_call> |
31 | <menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0" | 44 | <menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0" |
32 | mouse_opaque="true" name="Jacket" width="118"> | 45 | mouse_opaque="true" name="Jacket" width="118"> |
33 | <on_click function="Edit.TakeOff" userdata="jacket" /> | 46 | <on_click function="Edit.TakeOff" userdata="jacket" /> |
34 | <on_enable function="Edit.EnableTakeOff" userdata="jacket" /> | 47 | <on_enable function="Edit.EnableTakeOff" userdata="jacket" /> |
35 | </menu_item_call> | 48 | </menu_item_call> |
36 | <menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0" | 49 | <menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0" |
37 | mouse_opaque="true" name="Gloves" width="118"> | 50 | mouse_opaque="true" name="Gloves" width="118"> |
38 | <on_click function="Edit.TakeOff" userdata="gloves" /> | 51 | <on_click function="Edit.TakeOff" userdata="gloves" /> |
39 | <on_enable function="Edit.EnableTakeOff" userdata="gloves" /> | 52 | <on_enable function="Edit.EnableTakeOff" userdata="gloves" /> |
40 | </menu_item_call> | 53 | </menu_item_call> |
41 | <pie_menu enabled="true" label="More >" name="More >"> | 54 | <pie_menu enabled="true" label="More >" name="More >"> |
42 | <menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0" | 55 | <menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0" |
43 | mouse_opaque="true" name="Self Undershirt" width="118"> | 56 | mouse_opaque="true" name="Self Undershirt" width="118"> |
44 | <on_click function="Edit.TakeOff" userdata="undershirt" /> | 57 | <on_click function="Edit.TakeOff" userdata="undershirt" /> |
45 | <on_enable function="Edit.EnableTakeOff" userdata="undershirt" /> | 58 | <on_enable function="Edit.EnableTakeOff" userdata="undershirt" /> |
46 | </menu_item_call> | 59 | </menu_item_call> |
47 | <menu_item_separator /> | 60 | <menu_item_separator /> |
48 | <menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0" | 61 | <menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0" |
49 | mouse_opaque="true" name="All Clothes" width="118"> | 62 | mouse_opaque="true" name="All Clothes" width="118"> |
50 | <on_click function="Edit.TakeOff" userdata="all" /> | 63 | <on_click function="Edit.TakeOff" userdata="all" /> |
51 | </menu_item_call> | 64 | </menu_item_call> |
52 | <menu_item_separator /> | 65 | <menu_item_separator /> |
53 | <menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0" | 66 | <menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0" |
54 | mouse_opaque="true" name="Self Underpants" width="118"> | 67 | mouse_opaque="true" name="Self Underpants" width="118"> |
55 | <on_click function="Edit.TakeOff" userdata="underpants" /> | 68 | <on_click function="Edit.TakeOff" userdata="underpants" /> |
56 | <on_enable function="Edit.EnableTakeOff" userdata="underpants" /> | 69 | <on_enable function="Edit.EnableTakeOff" userdata="underpants" /> |
57 | </menu_item_call> | 70 | </menu_item_call> |
58 | </pie_menu> | 71 | </pie_menu> |
59 | <menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0" | 72 | <menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0" |
60 | mouse_opaque="true" name="Skirt" width="118"> | 73 | mouse_opaque="true" name="Skirt" width="118"> |
61 | <on_click function="Edit.TakeOff" userdata="skirt" /> | 74 | <on_click function="Edit.TakeOff" userdata="skirt" /> |
62 | <on_enable function="Edit.EnableTakeOff" userdata="skirt" /> | 75 | <on_enable function="Edit.EnableTakeOff" userdata="skirt" /> |
63 | </menu_item_call> | 76 | </menu_item_call> |
64 | </pie_menu> | 77 | </pie_menu> |
65 | <menu_item_separator /> | 78 | <menu_item_separator /> |
66 | <pie_menu enabled="true" label="HUD >" name="Object Detach HUD" /> | 79 | <pie_menu enabled="true" label="HUD >" name="Object Detach HUD" /> |
67 | <menu_item_separator /> | 80 | <menu_item_separator /> |
68 | <pie_menu enabled="true" label="Detach >" name="Object Detach" /> | 81 | <pie_menu enabled="true" label="Detach >" name="Object Detach" /> |
69 | <menu_item_separator /> | 82 | <menu_item_separator /> |
70 | <menu_item_call enabled="true" label="Detach All" name="Detach All"> | 83 | <menu_item_call enabled="true" label="Detach All" name="Detach All"> |
71 | <on_click function="Self.RemoveAllAttachments" userdata="" /> | 84 | <on_click function="Self.RemoveAllAttachments" userdata="" /> |
72 | <on_enable function="Self.EnableRemoveAllAttachments" /> | 85 | <on_enable function="Self.EnableRemoveAllAttachments" /> |
73 | </menu_item_call> | 86 | </menu_item_call> |
74 | </pie_menu> | 87 | </pie_menu> |
75 | <menu_item_call enabled="true" label="Stand Up" name="Stand Up"> | ||
76 | <on_click function="Self.StandUp" userdata="" /> | ||
77 | <on_enable function="Self.EnableStandUp" /> | ||
78 | </menu_item_call> | ||
79 | <menu_item_call enabled="true" label="Friends..." name="Friends..."> | ||
80 | <on_click function="ShowFloater" userdata="friends" /> | ||
81 | </menu_item_call> | ||
82 | <menu_item_call enabled="true" label="Gestures..." name="Gestures..."> | ||
83 | <on_click function="ShowFloater" userdata="gestures" /> | ||
84 | </menu_item_call> | ||
85 | <menu_item_separator /> | ||
86 | <menu_item_call enabled="true" label="Appearance..." name="Appearance..."> | 88 | <menu_item_call enabled="true" label="Appearance..." name="Appearance..."> |
87 | <on_click function="ShowFloater" userdata="appearance" /> | 89 | <on_click function="ShowFloater" userdata="appearance" /> |
88 | <on_enable function="Edit.EnableCustomizeAvatar" /> | 90 | <on_enable function="Edit.EnableCustomizeAvatar" /> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 48f59de..89c1fe8 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | |||
@@ -127,8 +127,7 @@ | |||
127 | </menu_item_call> | 127 | </menu_item_call> |
128 | <menu_item_separator /> | 128 | <menu_item_separator /> |
129 | <menu_item_call name="Duplicate" enabled="false" | 129 | <menu_item_call name="Duplicate" enabled="false" |
130 | label="Duplicate" | 130 | label="Duplicate"> |
131 | shortcut="control|D"> | ||
132 | <on_click function="Edit.Duplicate" userdata="" /> | 131 | <on_click function="Edit.Duplicate" userdata="" /> |
133 | <on_enable function="Edit.EnableDuplicate" /> | 132 | <on_enable function="Edit.EnableDuplicate" /> |
134 | </menu_item_call> | 133 | </menu_item_call> |
@@ -205,6 +204,12 @@ | |||
205 | userdata="all" /> | 204 | userdata="all" /> |
206 | </menu_item_call> | 205 | </menu_item_call> |
207 | </menu> | 206 | </menu> |
207 | <menu_item_call name="Refresh Appearance" | ||
208 | label="Refresh Appearance" | ||
209 | shortcut="control|alt|R"> | ||
210 | <on_click function="Advanced.RebakeTextures" | ||
211 | userdata="" /> | ||
212 | </menu_item_call> | ||
208 | <menu_item_separator /> | 213 | <menu_item_separator /> |
209 | <menu_item_call name="Gestures..." label="Gestures..." | 214 | <menu_item_call name="Gestures..." label="Gestures..." |
210 | shortcut="control|G"> | 215 | shortcut="control|G"> |
@@ -489,7 +494,7 @@ | |||
489 | <on_check control="FlyBtnState" /> | 494 | <on_check control="FlyBtnState" /> |
490 | </menu_item_check> | 495 | </menu_item_check> |
491 | <menu_item_separator /> | 496 | <menu_item_separator /> |
492 | <menu_item_call name="Create Landmark Here" | 497 | <menu_item_call name="Create Landmark Here" shortcut="control|D" |
493 | label="Create Landmark Here"> | 498 | label="Create Landmark Here"> |
494 | <on_click function="World.CreateLandmark" userdata="" /> | 499 | <on_click function="World.CreateLandmark" userdata="" /> |
495 | <on_enable function="World.EnableCreateLandmark" userdata="" /> | 500 | <on_enable function="World.EnableCreateLandmark" userdata="" /> |
@@ -932,24 +937,13 @@ | |||
932 | 937 | ||
933 | <menu_item_separator /> | 938 | <menu_item_separator /> |
934 | 939 | ||
935 | <menu_item_check name="High-res Snapshot" | 940 | |
936 | label="High-res Snapshot"> | ||
937 | <on_click function="ToggleControl" | ||
938 | userdata="HighResSnapshot" /> | ||
939 | <on_check control="HighResSnapshot" /> | ||
940 | </menu_item_check> | ||
941 | <menu_item_check name="Quiet Snapshots to Disk" | 941 | <menu_item_check name="Quiet Snapshots to Disk" |
942 | label="Quiet Snapshots to Disk"> | 942 | label="Quiet Snapshots to Disk"> |
943 | <on_click function="ToggleControl" | 943 | <on_click function="ToggleControl" |
944 | userdata="QuietSnapshotsToDisk" /> | 944 | userdata="QuietSnapshotsToDisk" /> |
945 | <on_check control="QuietSnapshotsToDisk" /> | 945 | <on_check control="QuietSnapshotsToDisk" /> |
946 | </menu_item_check> | 946 | </menu_item_check> |
947 | <menu_item_check name="Compress Snapshots to Disk" | ||
948 | label="Compress Snapshots to Disk"> | ||
949 | <on_click function="ToggleControl" | ||
950 | userdata="CompressSnapshotsToDisk" /> | ||
951 | <on_check control="CompressSnapshotsToDisk" /> | ||
952 | </menu_item_check> | ||
953 | <menu_item_check name="Show Mouselook Crosshairs" | 947 | <menu_item_check name="Show Mouselook Crosshairs" |
954 | label="Show Mouselook Crosshairs"> | 948 | label="Show Mouselook Crosshairs"> |
955 | <on_click function="ToggleControl" | 949 | <on_click function="ToggleControl" |
@@ -1619,7 +1613,8 @@ | |||
1619 | userdata="" /> | 1613 | userdata="" /> |
1620 | </menu_item_call> | 1614 | </menu_item_call> |
1621 | <menu_item_check name="Show XUI Names" | 1615 | <menu_item_check name="Show XUI Names" |
1622 | label="Show XUI Names"> | 1616 | label="Show XUI Names" |
1617 | shortcut="control|shift|x"> | ||
1623 | <on_click function="Advanced.ToggleXUINames" | 1618 | <on_click function="Advanced.ToggleXUINames" |
1624 | userdata="" /> | 1619 | userdata="" /> |
1625 | <on_check function="Advanced.CheckXUINames" | 1620 | <on_check function="Advanced.CheckXUINames" |
@@ -1835,12 +1830,6 @@ | |||
1835 | <on_click function="Advanced.DumpAttachments" | 1830 | <on_click function="Advanced.DumpAttachments" |
1836 | userdata="" /> | 1831 | userdata="" /> |
1837 | </menu_item_call> | 1832 | </menu_item_call> |
1838 | <menu_item_call name="Rebake Textures" | ||
1839 | label="Rebake Textures" | ||
1840 | shortcut="control|alt|R"> | ||
1841 | <on_click function="Advanced.RebakeTextures" | ||
1842 | userdata="" /> | ||
1843 | </menu_item_call> | ||
1844 | </menu> | 1833 | </menu> |
1845 | 1834 | ||
1846 | 1835 | ||
@@ -1963,12 +1952,6 @@ | |||
1963 | userdata="LimitSelectDistance" /> | 1952 | userdata="LimitSelectDistance" /> |
1964 | <on_check control="LimitSelectDistance" /> | 1953 | <on_check control="LimitSelectDistance" /> |
1965 | </menu_item_check> | 1954 | </menu_item_check> |
1966 | <menu_item_check name="Disable Camera Constraints" | ||
1967 | label="Disable Camera Constraints"> | ||
1968 | <on_click function="ToggleControl" | ||
1969 | userdata="DisableCameraConstraints" /> | ||
1970 | <on_check control="DisableCameraConstraints" /> | ||
1971 | </menu_item_check> | ||
1972 | <menu_item_check name="Mouse Smoothing" | 1955 | <menu_item_check name="Mouse Smoothing" |
1973 | label="Mouse Smoothing"> | 1956 | label="Mouse Smoothing"> |
1974 | <on_click function="ToggleControl" | 1957 | <on_click function="ToggleControl" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml index 67d3307..092daab 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml | |||
@@ -76,6 +76,10 @@ | |||
76 | font="SansSerifSmall" height="16" initial_value="false" | 76 | font="SansSerifSmall" height="16" initial_value="false" |
77 | label="Rotate Mini-Map" left="151" mouse_opaque="true" | 77 | label="Rotate Mini-Map" left="151" mouse_opaque="true" |
78 | name="rotate_mini_map_checkbox" radio_style="false" width="256" /> | 78 | name="rotate_mini_map_checkbox" radio_style="false" width="256" /> |
79 | <check_box bottom="-286" control_name="MiniMapTeleport" enabled="true" follows="left|top" | ||
80 | font="SansSerifSmall" height="16" initial_value="false" | ||
81 | label="Doubleclick Mini-Map Teleports" left="280" mouse_opaque="true" | ||
82 | name="teleport_mini_map_checkbox" radio_style="false" width="256" /> | ||
79 | <check_box bottom="-304" control_name="NotifyMoneyChange" enabled="true" | 83 | <check_box bottom="-304" control_name="NotifyMoneyChange" enabled="true" |
80 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" | 84 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" |
81 | label="Notify when Linden dollars (L$) spent or received" left="151" | 85 | label="Notify when Linden dollars (L$) spent or received" left="151" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml index 23e357f..1867323 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml | |||
@@ -79,18 +79,23 @@ | |||
79 | label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true" | 79 | label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true" |
80 | name="appearance camera movement" radio_style="false" | 80 | name="appearance camera movement" radio_style="false" |
81 | tool_tip="Use automatic camera positioning while in edit mode" width="242" /> | 81 | tool_tip="Use automatic camera positioning while in edit mode" width="242" /> |
82 | <check_box bottom_delta="-18" control_name="DisableCameraConstraints" enabled="true" | ||
83 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" | ||
84 | label="Disable camera constraints" left="148" mouse_opaque="true" | ||
85 | name="Disable camera constraints" radio_style="false" | ||
86 | tool_tip="Disables camera limits such as distance and terrain" width="242" /> | ||
82 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 87 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
83 | bottom="-228" drop_shadow_visible="true" enabled="true" follows="left|top" | 88 | bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top" |
84 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" | 89 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" |
85 | mouse_opaque="true" name="text2" v_pad="0" width="128"> | 90 | mouse_opaque="true" name="text2" v_pad="0" width="128"> |
86 | Avatar Display Options: | 91 | Avatar Display Options: |
87 | </text> | 92 | </text> |
88 | <check_box bottom="-232" control_name="FirstPersonAvatarVisible" enabled="true" | 93 | <check_box bottom_delta="-4" control_name="FirstPersonAvatarVisible" enabled="true" |
89 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" | 94 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" |
90 | label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="avfp" | 95 | label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="avfp" |
91 | radio_style="false" width="256" /> | 96 | radio_style="false" width="256" /> |
92 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 97 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
93 | bottom="-264" drop_shadow_visible="true" enabled="true" follows="left|top" | 98 | bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top" |
94 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" | 99 | font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" |
95 | mouse_opaque="true" name="text5" v_pad="0" width="128"> | 100 | mouse_opaque="true" name="text5" v_pad="0" width="128"> |
96 | Joystick Options: | 101 | Joystick Options: |
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 e8c341e..ecacc78 100644 --- a/linden/indra/newview/skins/default/xui/en-us/strings.xml +++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml | |||
@@ -1,180 +1,183 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <!-- This file contains strings that used to be hardcoded in the source. | 2 | <!-- This file contains strings that used to be hardcoded in the source. |
3 | It is only for those strings which don't belong in a floater. | 3 | It is only for those strings which don't belong in a floater. |
4 | For example, the strings used in avatar chat bubbles, and strings | 4 | For example, the strings used in avatar chat bubbles, and strings |
5 | that are returned from one component and may appear in many places--> | 5 | that are returned from one component and may appear in many places--> |
6 | <strings> | 6 | <strings> |
7 | 7 | ||
8 | <!-- Login --> | 8 | <!-- Login --> |
9 | <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> | 9 | <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> |
10 | <string name="LoginAuthenticating">Authenticating</string> | 10 | <string name="LoginAuthenticating">Authenticating</string> |
11 | <string name="LoginMaintenance">Performing account maintenance...</string> | 11 | <string name="LoginMaintenance">Performing account maintenance...</string> |
12 | <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string> | 12 | <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string> |
13 | <string name="LoginPrecaching">Loading world...</string> | 13 | <string name="LoginPrecaching">Loading world...</string> |
14 | <string name="LoginInitializingBrowser">Initializing embedded web browser...</string> | 14 | <string name="LoginInitializingBrowser">Initializing embedded web browser...</string> |
15 | <string name="LoginInitializingMultimedia">Initializing multimedia...</string> | 15 | <string name="LoginInitializingMultimedia">Initializing multimedia...</string> |
16 | <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string> | 16 | <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string> |
17 | <string name="LoginProcessingResponse">Processing Response...</string> | 17 | <string name="LoginProcessingResponse">Processing Response...</string> |
18 | <string name="LoginInitializingWorld">Initializing World...</string> | 18 | <string name="LoginInitializingWorld">Initializing World...</string> |
19 | <string name="LoginDecodingImages">Decoding images...</string> | 19 | <string name="LoginDecodingImages">Decoding images...</string> |
20 | <string name="LoginInitializingQuicktime">Initializing QuickTime...</string> | 20 | <string name="LoginInitializingQuicktime">Initializing QuickTime...</string> |
21 | <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string> | 21 | <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string> |
22 | <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string> | 22 | <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string> |
23 | <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string> | 23 | <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string> |
24 | <string name="LoginConnectingToRegion">Connecting to region...</string> | 24 | <string name="LoginConnectingToRegion">Connecting to region...</string> |
25 | <string name="LoginDownloadingClothing">Downloading clothing...</string> | 25 | <string name="LoginDownloadingClothing">Downloading clothing...</string> |
26 | <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> | 26 | <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> |
27 | 27 | ||
28 | 28 | ||
29 | <!-- Disconnection --> | 29 | <!-- Disconnection --> |
30 | <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> | 30 | <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> |
31 | 31 | ||
32 | 32 | ||
33 | <!-- Tooltip, llhoverview.cpp --> | 33 | <!-- Tooltip, llhoverview.cpp --> |
34 | <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> | 34 | <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar --> |
35 | <string name="TooltipNoName">(no name)</string> <!-- No name on an object --> | 35 | <string name="TooltipNoName">(no name)</string> <!-- No name on an object --> |
36 | <string name="TooltipOwner">Owner:</string> <!-- Owner name follows --> | 36 | <string name="TooltipOwner">Owner:</string> <!-- Owner name follows --> |
37 | <string name="TooltipPublic">Public</string> <!-- Public permissions on an object --> | 37 | <string name="TooltipPublic">Public</string> <!-- Public permissions on an object --> |
38 | <string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group --> | 38 | <string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group --> |
39 | <string name="TooltipFlagScript">Script</string> | 39 | <string name="TooltipFlagScript">Script</string> |
40 | <string name="TooltipFlagPhysics">Physics</string> | 40 | <string name="TooltipFlagPhysics">Physics</string> |
41 | <string name="TooltipFlagTouch">Touch</string> | 41 | <string name="TooltipFlagTouch">Touch</string> |
42 | <string name="TooltipFlagL$">L$</string> | 42 | <string name="TooltipFlagL$">L$</string> |
43 | <string name="TooltipFlagDropInventory">Drop Inventory</string> | 43 | <string name="TooltipFlagDropInventory">Drop Inventory</string> |
44 | <string name="TooltipFlagPhantom">Phantom</string> | 44 | <string name="TooltipFlagPhantom">Phantom</string> |
45 | <string name="TooltipFlagTemporary">Temporary</string> | 45 | <string name="TooltipFlagTemporary">Temporary</string> |
46 | <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string> | 46 | <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string> |
47 | <string name="TooltipFreeToCopy">Free to copy</string> | 47 | <string name="TooltipFreeToCopy">Free to copy</string> |
48 | <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version --> | 48 | <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version --> |
49 | <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) --> | 49 | <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) --> |
50 | <string name="TooltipFlagGroupBuild">Group Build</string> | 50 | <string name="TooltipFlagGroupBuild">Group Build</string> |
51 | <string name="TooltipFlagNoBuild">No Build</string> | 51 | <string name="TooltipFlagNoBuild">No Build</string> |
52 | <string name="TooltipFlagNoEdit">Group Build</string> | 52 | <string name="TooltipFlagNoEdit">Group Build</string> |
53 | <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area --> | 53 | <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area --> |
54 | <string name="TooltipFlagNoFly">No Fly</string> | 54 | <string name="TooltipFlagNoFly">No Fly</string> |
55 | <string name="TooltipFlagGroupScripts">Group Scripts</string> | 55 | <string name="TooltipFlagGroupScripts">Group Scripts</string> |
56 | <string name="TooltipFlagNoScripts">No Scripts</string> | 56 | <string name="TooltipFlagNoScripts">No Scripts</string> |
57 | <string name="TooltipLand">Land:</string> | 57 | <string name="TooltipLand">Land:</string> |
58 | <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string> | 58 | <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string> |
59 | 59 | ||
60 | 60 | ||
61 | <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. --> | 61 | <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. --> |
62 | <string name="RetrievingData">Retrieving...</string> | 62 | <string name="RetrievingData">Retrieving...</string> |
63 | 63 | ||
64 | <string name="ReleaseNotes">Release Notes</string> | 64 | <string name="ReleaseNotes">Release Notes</string> |
65 | 65 | ||
66 | <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData --> | 66 | <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData --> |
67 | <string name="LoadingData">Loading...</string> | 67 | <string name="LoadingData">Loading...</string> |
68 | 68 | ||
69 | 69 | ||
70 | <!-- namecache --> | 70 | <!-- namecache --> |
71 | <!-- Avatar name: text shown for LLUUID::null --> | 71 | <!-- Avatar name: text shown for LLUUID::null --> |
72 | <string name="AvatarNameNobody">(nobody)</string> | 72 | <string name="AvatarNameNobody">(nobody)</string> |
73 | 73 | ||
74 | <!-- Avatar name: text shown while fetching name --> | 74 | <!-- Avatar name: text shown while fetching name --> |
75 | <string name="AvatarNameWaiting">(waiting)</string> | 75 | <string name="AvatarNameWaiting">(waiting)</string> |
76 | 76 | ||
77 | <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. --> | 77 | <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. --> |
78 | <string name="AvatarNameHippos">(hippos)</string> | 78 | <string name="AvatarNameHippos">(hippos)</string> |
79 | 79 | ||
80 | <!-- Group name: text shown for LLUUID::null --> | 80 | <!-- Group name: text shown for LLUUID::null --> |
81 | <string name="GroupNameNone">(none)</string> | 81 | <string name="GroupNameNone">(none)</string> |
82 | 82 | ||
83 | <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. --> | 83 | <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. --> |
84 | <string name="AssetErrorNone">No error</string> | 84 | <string name="AssetErrorNone">No error</string> |
85 | <string name="AssetErrorRequestFailed">Asset request: failed</string> | 85 | <string name="AssetErrorRequestFailed">Asset request: failed</string> |
86 | <string name="AssetErrorNonexistentFile">Asset request: non-existent file</string> | 86 | <string name="AssetErrorNonexistentFile">Asset request: non-existent file</string> |
87 | <string name="AssetErrorNotInDatabase">Asset request: asset not found in database</string> | 87 | <string name="AssetErrorNotInDatabase">Asset request: asset not found in database</string> |
88 | <string name="AssetErrorEOF">End of file</string> | 88 | <string name="AssetErrorEOF">End of file</string> |
89 | <string name="AssetErrorCannotOpenFile">Cannot open file</string> | 89 | <string name="AssetErrorCannotOpenFile">Cannot open file</string> |
90 | <string name="AssetErrorFileNotFound">File not found</string> | 90 | <string name="AssetErrorFileNotFound">File not found</string> |
91 | <string name="AssetErrorTCPTimeout">File transfer timeout</string> | 91 | <string name="AssetErrorTCPTimeout">File transfer timeout</string> |
92 | <string name="AssetErrorCircuitGone">Circuit gone</string> | 92 | <string name="AssetErrorCircuitGone">Circuit gone</string> |
93 | <string name="AssetErrorUnknownStatus">Unknown status</string> | 93 | <string name="AssetErrorUnknownStatus">Unknown status</string> |
94 | 94 | ||
95 | <!-- llvoavatar. Displayed in the avatar's chat bubble --> | 95 | <!-- llvoavatar. Displayed in the avatar's chat bubble --> |
96 | <string name="AvatarEditingApparance">(Editing Appearance)</string> | 96 | <string name="AvatarEditingApparance">(Editing Appearance)</string> |
97 | <string name="AvatarAway">Away</string> | 97 | <string name="AvatarAway">Away</string> |
98 | <string name="AvatarBusy">Busy</string> | 98 | <string name="AvatarBusy">Busy</string> |
99 | <string name="AvatarMuted">Muted</string> | 99 | <string name="AvatarMuted">Muted</string> |
100 | 100 | ||
101 | <!-- animations --> | 101 | <!-- animations --> |
102 | <string name="anim_express_afraid">Afraid</string> | 102 | <string name="anim_express_afraid">Afraid</string> |
103 | <string name="anim_express_anger">Angry</string> | 103 | <string name="anim_express_anger">Angry</string> |
104 | <string name="anim_away">Away</string> | 104 | <string name="anim_away">Away</string> |
105 | <string name="anim_backflip">Backflip</string> | 105 | <string name="anim_backflip">Backflip</string> |
106 | <string name="anim_express_laugh">Belly Laugh</string> | 106 | <string name="anim_express_laugh">Belly Laugh</string> |
107 | <string name="anim_express_toothsmile">BigSmile</string> | 107 | <string name="anim_express_toothsmile">BigSmile</string> |
108 | <string name="anim_blowkiss">Blow Kiss</string> | 108 | <string name="anim_blowkiss">Blow Kiss</string> |
109 | <string name="anim_express_bored">Bored</string> | 109 | <string name="anim_express_bored">Bored</string> |
110 | <string name="anim_bow">Bow</string> | 110 | <string name="anim_bow">Bow</string> |
111 | <string name="anim_clap">Clap</string> | 111 | <string name="anim_clap">Clap</string> |
112 | <string name="anim_courtbow">Court Bow</string> | 112 | <string name="anim_courtbow">Court Bow</string> |
113 | <string name="anim_express_cry">Cry</string> | 113 | <string name="anim_express_cry">Cry</string> |
114 | <string name="anim_dance1">Dance 1</string> | 114 | <string name="anim_dance1">Dance 1</string> |
115 | <string name="anim_dance2">Dance 2</string> | 115 | <string name="anim_dance2">Dance 2</string> |
116 | <string name="anim_dance3">Dance 3</string> | 116 | <string name="anim_dance3">Dance 3</string> |
117 | <string name="anim_dance4">Dance 4</string> | 117 | <string name="anim_dance4">Dance 4</string> |
118 | <string name="anim_dance5">Dance 5</string> | 118 | <string name="anim_dance5">Dance 5</string> |
119 | <string name="anim_dance6">Dance 6</string> | 119 | <string name="anim_dance6">Dance 6</string> |
120 | <string name="anim_dance7">Dance 7</string> | 120 | <string name="anim_dance7">Dance 7</string> |
121 | <string name="anim_dance8">Dance 8</string> | 121 | <string name="anim_dance8">Dance 8</string> |
122 | <string name="anim_express_disdain">Disdain</string> | 122 | <string name="anim_express_disdain">Disdain</string> |
123 | <string name="anim_drink">Drink</string> | 123 | <string name="anim_drink">Drink</string> |
124 | <string name="anim_express_embarrased">Embarrassed</string> | 124 | <string name="anim_express_embarrased">Embarrassed</string> |
125 | <string name="anim_angry_fingerwag">Finger Wag</string> | 125 | <string name="anim_angry_fingerwag">Finger Wag</string> |
126 | <string name="anim_fist_pump">Fist Pump</string> | 126 | <string name="anim_fist_pump">Fist Pump</string> |
127 | <string name="anim_yoga_float">Floating Yoga</string> | 127 | <string name="anim_yoga_float">Floating Yoga</string> |
128 | <string name="anim_express_frown">Frown</string> | 128 | <string name="anim_express_frown">Frown</string> |
129 | <string name="anim_impatient">Impatient</string> | 129 | <string name="anim_impatient">Impatient</string> |
130 | <string name="anim_jumpforjoy">Jump For Joy</string> | 130 | <string name="anim_jumpforjoy">Jump For Joy</string> |
131 | <string name="anim_kissmybutt">Kiss My Butt</string> | 131 | <string name="anim_kissmybutt">Kiss My Butt</string> |
132 | <string name="anim_express_kiss">Kiss</string> | 132 | <string name="anim_express_kiss">Kiss</string> |
133 | <string name="anim_laugh_short">Laugh</string> | 133 | <string name="anim_laugh_short">Laugh</string> |
134 | <string name="anim_musclebeach">Muscle Beach</string> | 134 | <string name="anim_musclebeach">Muscle Beach</string> |
135 | <string name="anim_no_unhappy">No (Unhappy)</string> | 135 | <string name="anim_no_unhappy">No (Unhappy)</string> |
136 | <string name="anim_no_head">No</string> | 136 | <string name="anim_no_head">No</string> |
137 | <string name="anim_nyanya">Nya-nya-nya</string> | 137 | <string name="anim_nyanya">Nya-nya-nya</string> |
138 | <string name="anim_punch_onetwo">One-Two Punch</string> | 138 | <string name="anim_punch_onetwo">One-Two Punch</string> |
139 | <string name="anim_express_open_mouth">Open Mouth</string> | 139 | <string name="anim_express_open_mouth">Open Mouth</string> |
140 | <string name="anim_peace">Peace</string> | 140 | <string name="anim_peace">Peace</string> |
141 | <string name="anim_point_you">Point at Other</string> | 141 | <string name="anim_point_you">Point at Other</string> |
142 | <string name="anim_point_me">Point at Self</string> | 142 | <string name="anim_point_me">Point at Self</string> |
143 | <string name="anim_punch_l">Punch Left</string> | 143 | <string name="anim_punch_l">Punch Left</string> |
144 | <string name="anim_punch_r">Punch Right</string> | 144 | <string name="anim_punch_r">Punch Right</string> |
145 | <string name="anim_rps_countdown">RPS count</string> | 145 | <string name="anim_rps_countdown">RPS count</string> |
146 | <string name="anim_rps_paper">RPS paper</string> | 146 | <string name="anim_rps_paper">RPS paper</string> |
147 | <string name="anim_rps_rock">RPS rock</string> | 147 | <string name="anim_rps_rock">RPS rock</string> |
148 | <string name="anim_rps_scissors">RPS scissors</string> | 148 | <string name="anim_rps_scissors">RPS scissors</string> |
149 | <string name="anim_express_repulsed">Repulsed</string> | 149 | <string name="anim_express_repulsed">Repulsed</string> |
150 | <string name="anim_kick_roundhouse_r">Roundhouse Kick</string> | 150 | <string name="anim_kick_roundhouse_r">Roundhouse Kick</string> |
151 | <string name="anim_express_sad">Sad</string> | 151 | <string name="anim_express_sad">Sad</string> |
152 | <string name="anim_salute">Salute</string> | 152 | <string name="anim_salute">Salute</string> |
153 | <string name="anim_shout">Shout</string> | 153 | <string name="anim_shout">Shout</string> |
154 | <string name="anim_express_shrug">Shrug</string> | 154 | <string name="anim_express_shrug">Shrug</string> |
155 | <string name="anim_express_smile">Smile</string> | 155 | <string name="anim_express_smile">Smile</string> |
156 | <string name="anim_smoke_idle">Smoke Idle</string> | 156 | <string name="anim_smoke_idle">Smoke Idle</string> |
157 | <string name="anim_smoke_inhale">Smoke Inhale</string> | 157 | <string name="anim_smoke_inhale">Smoke Inhale</string> |
158 | <string name="anim_smoke_throw_down">Smoke Throw Down</string> | 158 | <string name="anim_smoke_throw_down">Smoke Throw Down</string> |
159 | <string name="anim_express_surprise">Surprise</string> | 159 | <string name="anim_express_surprise">Surprise</string> |
160 | <string name="anim_sword_strike_r">Sword Strike</string> | 160 | <string name="anim_sword_strike_r">Sword Strike</string> |
161 | <string name="anim_angry_tantrum">Tantrum</string> | 161 | <string name="anim_angry_tantrum">Tantrum</string> |
162 | <string name="anim_express_tongue_out">TongueOut</string> | 162 | <string name="anim_express_tongue_out">TongueOut</string> |
163 | <string name="anim_hello">Wave</string> | 163 | <string name="anim_hello">Wave</string> |
164 | <string name="anim_whisper">Whisper</string> | 164 | <string name="anim_whisper">Whisper</string> |
165 | <string name="anim_whistle">Whistle</string> | 165 | <string name="anim_whistle">Whistle</string> |
166 | <string name="anim_express_wink">Wink</string> | 166 | <string name="anim_express_wink">Wink</string> |
167 | <string name="anim_wink_hollywood">Wink (Hollywood)</string> | 167 | <string name="anim_wink_hollywood">Wink (Hollywood)</string> |
168 | <string name="anim_express_worry">Worry</string> | 168 | <string name="anim_express_worry">Worry</string> |
169 | <string name="anim_yes_happy">Yes (Happy)</string> | 169 | <string name="anim_yes_happy">Yes (Happy)</string> |
170 | <string name="anim_yes_head">Yes</string> | 170 | <string name="anim_yes_head">Yes</string> |
171 | 171 | ||
172 | <string name="texture_loading">Loading...</string> | 172 | <string name="texture_loading">Loading...</string> |
173 | <string name="worldmap_offline">Offline</string> | 173 | <string name="worldmap_offline">Offline</string> |
174 | 174 | ||
175 | <!-- Chat --> | 175 | <!-- Chat --> |
176 | <string name="whisper">whispers:</string> | 176 | <string name="whisper">whispers:</string> |
177 | <string name="shout">shouts:</string> | 177 | <string name="shout">shouts:</string> |
178 | 178 | ||
179 | </strings> | 179 | <!-- System messages --> |
180 | 180 | <string name="landmark_created">You created a landmark at</string> | |
181 | |||
182 | </strings> | ||
183 | |||
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml index dabada6..b6e77be 100644 --- a/linden/indra/newview/skins/silver/colors_base.xml +++ b/linden/indra/newview/skins/silver/colors_base.xml | |||
@@ -100,9 +100,9 @@ | |||
100 | <PieMenuSelectedColor value="185, 200, 220, 120" /> <!-- Color of pie menu slice when selected --> | 100 | <PieMenuSelectedColor value="185, 200, 220, 120" /> <!-- Color of pie menu slice when selected --> |
101 | 101 | ||
102 | <!-- MENU BAR --> | 102 | <!-- MENU BAR --> |
103 | <ParcelTextColor value="40, 40, 90, 255" /> <!-- Parcel name on menu bar, normal state --> | 103 | <ParcelTextColor value="40, 40, 90, 255" /> <!-- Parcel name on menu bar, normal state --> |
104 | <ParcelHoverColor value="70, 70, 100, 255" /> <!-- Parcel name on menu bar, hover state --> | 104 | <ParcelHoverColor value="70, 70, 100, 255" /> <!-- Parcel name on menu bar, hover state --> |
105 | <TimeTextColor value="0, 30, 60, 255" /> <!-- SL Time on menu bar --> | 105 | <TimeTextColor value="0, 30, 60, 255" /> <!-- SL Time on menu bar --> |
106 | <BalanceTextColor value="0, 100, 40, 255" /> <!-- Linden dollar balance on menu bar --> | 106 | <BalanceTextColor value="0, 100, 40, 255" /> <!-- Linden dollar balance on menu bar --> |
107 | <HealthTextColor value="110, 15, 15, 255" /> <!-- Damage meter text on menu bar --> | 107 | <HealthTextColor value="110, 15, 15, 255" /> <!-- Damage meter text on menu bar --> |
108 | 108 | ||