diff options
author | unknown | 2008-12-19 00:17:06 -0700 |
---|---|---|
committer | unknown | 2008-12-19 00:17:06 -0700 |
commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/newview/skins/default/xui | |
parent | fuckyougit (diff) | |
parent | 1.1 wip copy (diff) | |
download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz |
resolved merge conflicts
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
9 files changed, 72 insertions, 63 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 8bbdc3d..c2d4301 100644 --- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml +++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml | |||
@@ -2957,9 +2957,9 @@ Download to your Applications folder? | |||
2957 | Cancel | 2957 | Cancel |
2958 | </option> | 2958 | </option> |
2959 | </alert> | 2959 | </alert> |
2960 | <alert modal="true" name="WebLaunchSupportWiki"> | 2960 | <alert modal="true" name="WebLaunchImprudenceBlog"> |
2961 | <message name="message"> | 2961 | <message name="message"> |
2962 | Go to the Official Linden Blog, for the Latest News and Information. | 2962 | Go to the Official Imprudence Blog, for the Latest News and Information. |
2963 | </message> | 2963 | </message> |
2964 | <ignore name="ignore"> | 2964 | <ignore name="ignore"> |
2965 | When launching web browser to view the blog | 2965 | When launching web browser to view the blog |
@@ -2971,6 +2971,20 @@ Download to your Applications folder? | |||
2971 | Cancel | 2971 | Cancel |
2972 | </option> | 2972 | </option> |
2973 | </alert> | 2973 | </alert> |
2974 | <alert modal="true" name="WebLaunchImprudenceForums"> | ||
2975 | <message name="message"> | ||
2976 | Go to the Official Imprudence Forums to discuss the Imprudence Project. | ||
2977 | </message> | ||
2978 | <ignore name="ignore"> | ||
2979 | When launching web browser to view the forums | ||
2980 | </ignore> | ||
2981 | <option name="Gotopage"> | ||
2982 | OK | ||
2983 | </option> | ||
2984 | <option name="Cancel"> | ||
2985 | Cancel | ||
2986 | </option> | ||
2987 | </alert> | ||
2974 | <alert modal="true" name="WebLaunchLSLGuide"> | 2988 | <alert modal="true" name="WebLaunchLSLGuide"> |
2975 | <message name="message"> | 2989 | <message name="message"> |
2976 | Go to the Scripting Guide for scripting help? | 2990 | Go to the Scripting Guide for scripting help? |
@@ -4225,7 +4239,7 @@ will only work if a script is added with a money() event. | |||
4225 | </alert> | 4239 | </alert> |
4226 | <alert modal="true" name="ClickOpenF1Help"> | 4240 | <alert modal="true" name="ClickOpenF1Help"> |
4227 | <message name="message"> | 4241 | <message name="message"> |
4228 | Visit the Second Life Support Web site? | 4242 | Visit the Second Life Support Web site? (note: this is not an Imprudence Help site) |
4229 | </message> | 4243 | </message> |
4230 | <ignore name="ignore"> | 4244 | <ignore name="ignore"> |
4231 | When visiting the Second Life Support Website. | 4245 | When visiting the Second Life Support Website. |
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 c3058c4..076598c 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 | |||
@@ -36,9 +36,12 @@ | |||
36 | </string> | 36 | </string> |
37 | <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5" | 37 | <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5" |
38 | name="profile_callee_btn" width="80" /> | 38 | name="profile_callee_btn" width="80" /> |
39 | <button bottom_delta="0" follows="left|top" font="SansSerif" | ||
40 | halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85" | ||
41 | mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" /> | ||
39 | <button bottom="-40" follows="left|top" halign="center" height="20" | 42 | <button bottom="-40" follows="left|top" halign="center" height="20" |
40 | image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" | 43 | image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" |
41 | label="Call" left_delta="85" name="start_call_btn" width="100" /> | 44 | label="Call" left_delta="107" name="start_call_btn" width="100" /> |
42 | <button bottom="-40" follows="left|top" halign="center" height="20" | 45 | <button bottom="-40" follows="left|top" halign="center" height="20" |
43 | image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" | 46 | image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" |
44 | label="End Call" left_delta="0" name="end_call_btn" pad_right="10" | 47 | label="End Call" left_delta="0" name="end_call_btn" pad_right="10" |
@@ -51,9 +54,6 @@ | |||
51 | image_unselected="icn_speaker_dark.tga" label="" left_delta="56" | 54 | image_unselected="icn_speaker_dark.tga" label="" left_delta="56" |
52 | name="mute_btn" tool_tip="Mute voice" width="25" /> | 55 | name="mute_btn" tool_tip="Mute voice" width="25" /> |
53 | </panel> | 56 | </panel> |
54 | <button bottom_delta="0" follows="right|top" font="SansSerif" | ||
55 | halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5" | ||
56 | mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" /> | ||
57 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" | 57 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" |
58 | bottom="30" embedded_items="false" enabled="false" | 58 | bottom="30" embedded_items="false" enabled="false" |
59 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" | 59 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" |
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 5b2d310..077ab23 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 | |||
@@ -12,9 +12,11 @@ | |||
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="65" 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="255" name="address" width="280" /> | 15 | left_delta="75" max_chars="235" name="address" width="225" /> |
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="285" name="go" width="55" /> | 17 | left_delta="230" name="go" width="55" /> |
18 | <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home" | ||
19 | left_delta="60" name="home" width="55" /> | ||
18 | </layout_panel> | 20 | </layout_panel> |
19 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" | 21 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" |
20 | name="parcel_owner_controls" user_resize="false" width="540"> | 22 | name="parcel_owner_controls" user_resize="false" width="540"> |
@@ -30,6 +32,8 @@ | |||
30 | <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" |
31 | label="Always open in my web browser" left_delta="190" name="open_always" | 33 | label="Always open in my web browser" left_delta="190" name="open_always" |
32 | width="200" /> | 34 | width="200" /> |
35 | <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set Home To Here" | ||
36 | left="-265" name="set_home" width="155" /> | ||
33 | <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" |
34 | name="close" width="70" /> | 38 | name="close" width="70" /> |
35 | </layout_panel> | 39 | </layout_panel> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml index 2afc560..8d06657 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml | |||
@@ -21,12 +21,12 @@ | |||
21 | <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true" | 21 | <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true" |
22 | height="317" label="Help" left="80" mouse_opaque="false" name="Help" | 22 | height="317" label="Help" left="80" mouse_opaque="false" name="Help" |
23 | opaque="true" tear_off="false" width="166"> | 23 | opaque="true" tear_off="false" width="166"> |
24 | <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0" | 24 | <menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0" |
25 | mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166"> | 25 | mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166"> |
26 | <on_click function="ShowFloater" userdata="help f1" /> | 26 | <on_click function="ShowFloater" userdata="help f1" /> |
27 | </menu_item_call> | 27 | </menu_item_call> |
28 | <menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0" | 28 | <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence..." left="0" |
29 | mouse_opaque="true" name="About Second Life..." width="166"> | 29 | mouse_opaque="true" name="About Imprudence..." width="166"> |
30 | <on_click function="ShowFloater" userdata="about" /> | 30 | <on_click function="ShowFloater" userdata="about" /> |
31 | </menu_item_call> | 31 | </menu_item_call> |
32 | </menu> | 32 | </menu> |
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 f82f254..682acb9 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 | |||
@@ -271,6 +271,11 @@ | |||
271 | <on_enable function="View.EnableLastChatter" /> | 271 | <on_enable function="View.EnableLastChatter" /> |
272 | </menu_item_call> | 272 | </menu_item_call> |
273 | <menu_item_separator /> | 273 | <menu_item_separator /> |
274 | <menu_item_call name="Web Browser" label="Web Browser" | ||
275 | shortcut="control|B"> | ||
276 | <on_click function="ShowFloater" userdata="inworld browser" /> | ||
277 | </menu_item_call> | ||
278 | <menu_item_separator /> | ||
274 | <menu_item_check name="Toolbar" label="Toolbar"> | 279 | <menu_item_check name="Toolbar" label="Toolbar"> |
275 | <on_click function="ShowFloater" userdata="toolbar" /> | 280 | <on_click function="ShowFloater" userdata="toolbar" /> |
276 | <on_check function="FloaterVisible" userdata="toolbar" /> | 281 | <on_check function="FloaterVisible" userdata="toolbar" /> |
@@ -360,9 +365,9 @@ | |||
360 | <on_click function="View.HighlightTransparent" userdata="" /> | 365 | <on_click function="View.HighlightTransparent" userdata="" /> |
361 | <on_check function="View.CheckHighlightTransparent" /> | 366 | <on_check function="View.CheckHighlightTransparent" /> |
362 | </menu_item_check> | 367 | </menu_item_check> |
363 | <menu_item_check name="Beacons Always On" label="Beacons Always On"> | 368 | <menu_item_check name="Beacons Always On" label="Show Beacons"> |
364 | <on_click function="ToggleControl" userdata="BeaconAlwaysOn" /> | 369 | <on_click function="ToggleControl" userdata="BeaconsEnabled" /> |
365 | <on_check control="BeaconAlwaysOn" /> | 370 | <on_check control="BeaconsEnabled" /> |
366 | </menu_item_check> | 371 | </menu_item_check> |
367 | <menu name="Beacons" create_jump_keys="true" label="Beacons" | 372 | <menu name="Beacons" create_jump_keys="true" label="Beacons" |
368 | opaque="true" tear_off="true"> | 373 | opaque="true" tear_off="true"> |
@@ -608,6 +613,12 @@ | |||
608 | userdata="movable" /> | 613 | userdata="movable" /> |
609 | <on_check control="SelectMovableOnly" /> | 614 | <on_check control="SelectMovableOnly" /> |
610 | </menu_item_check> | 615 | </menu_item_check> |
616 | <menu_item_check name="Select Only Copyable Objects" | ||
617 | label="Select Only Copyable Objects"> | ||
618 | <on_click function="Tools.SelectOnlyCopyableObjects" | ||
619 | userdata="copyable" /> | ||
620 | <on_check control="SelectCopyableOnly" /> | ||
621 | </menu_item_check> | ||
611 | <menu_item_check name="Select By Surrounding" | 622 | <menu_item_check name="Select By Surrounding" |
612 | label="Select By Surrounding"> | 623 | label="Select By Surrounding"> |
613 | <on_click function="Tools.SelectBySurrounding" | 624 | <on_click function="Tools.SelectBySurrounding" |
@@ -764,7 +775,7 @@ | |||
764 | 775 | ||
765 | <menu name="Help" create_jump_keys="true" label="Help" | 776 | <menu name="Help" create_jump_keys="true" label="Help" |
766 | opaque="true" tear_off="true"> | 777 | opaque="true" tear_off="true"> |
767 | <menu_item_call name="Second Life Help" label="Second Life Help" | 778 | <menu_item_call name="Viewer Help" label="Viewer Help" |
768 | shortcut="F1"> | 779 | shortcut="F1"> |
769 | <on_click function="ShowFloater" userdata="help f1" /> | 780 | <on_click function="ShowFloater" userdata="help f1" /> |
770 | </menu_item_call> | 781 | </menu_item_call> |
@@ -772,10 +783,15 @@ | |||
772 | <on_click function="ShowFloater" userdata="help tutorial" /> | 783 | <on_click function="ShowFloater" userdata="help tutorial" /> |
773 | </menu_item_call> | 784 | </menu_item_call> |
774 | <menu_item_separator /> | 785 | <menu_item_separator /> |
775 | <menu_item_call name="Official Linden Blog..." | 786 | <menu_item_call name="Imprudence Blog..." |
776 | label="Official Linden Blog..."> | 787 | label="Imprudence Blog..."> |
788 | <on_click function="PromptShowURL" | ||
789 | userdata="WebLaunchImprudenceBlog,http://www.imprudenceviewer.org/" /> | ||
790 | </menu_item_call> | ||
791 | <menu_item_call name="Imprudence Forums..." | ||
792 | label="Imprudence Forums..."> | ||
777 | <on_click function="PromptShowURL" | 793 | <on_click function="PromptShowURL" |
778 | userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" /> | 794 | userdata="WebLaunchImprudenceForums,http://www.imprudenceviewer.org/forums/" /> |
779 | </menu_item_call> | 795 | </menu_item_call> |
780 | <menu_item_separator /> | 796 | <menu_item_separator /> |
781 | <menu_item_call name="Scripting Guide..." | 797 | <menu_item_call name="Scripting Guide..." |
@@ -801,42 +817,8 @@ | |||
801 | <on_click function="ShowFloater" userdata="lag meter" /> | 817 | <on_click function="ShowFloater" userdata="lag meter" /> |
802 | </menu_item_call> | 818 | </menu_item_call> |
803 | <menu_item_separator /> | 819 | <menu_item_separator /> |
804 | <menu name="Bug Reporting" create_jump_keys="true" | 820 | <menu_item_call name="About Imprudence..." |
805 | label="Bug Reporting" opaque="true" tear_off="true"> | 821 | label="About Imprudence..."> |
806 | <menu_item_call name="Public Issue Tracker..." | ||
807 | label="Public Issue Tracker..."> | ||
808 | <on_click function="PromptShowURL" | ||
809 | userdata="WebLaunchPublicIssue,http://jira.secondlife.com" /> | ||
810 | </menu_item_call> | ||
811 | <menu_item_call name="Publc Issue Tracker Help..." | ||
812 | label="Public Issue Tracker Help..."> | ||
813 | <on_click function="PromptShowURL" | ||
814 | userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" /> | ||
815 | </menu_item_call> | ||
816 | <menu_item_separator /> | ||
817 | <menu_item_call name="Bug Reporing 101..." | ||
818 | label="Bug Reporting 101..."> | ||
819 | <on_click function="PromptShowURL" | ||
820 | userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" /> | ||
821 | </menu_item_call> | ||
822 | <menu_item_call name="Security Issues..." | ||
823 | label="Security Issues..."> | ||
824 | <on_click function="PromptShowURL" | ||
825 | userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" /> | ||
826 | </menu_item_call> | ||
827 | <menu_item_call name="QA Wiki..." label="QA Wiki..."> | ||
828 | <on_click function="PromptShowURL" | ||
829 | userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" /> | ||
830 | </menu_item_call> | ||
831 | <menu_item_separator /> | ||
832 | <menu_item_call name="Report Bug..." label="Report Bug..."> | ||
833 | <on_click function="PromptShowURL" | ||
834 | userdata="WebLaunchPublicIssue,http://jira.secondlife.com" /> | ||
835 | </menu_item_call> | ||
836 | </menu> | ||
837 | <menu_item_separator /> | ||
838 | <menu_item_call name="About Second Life..." | ||
839 | label="About Second Life..."> | ||
840 | <on_click function="ShowFloater" userdata="about" /> | 822 | <on_click function="ShowFloater" userdata="about" /> |
841 | </menu_item_call> | 823 | </menu_item_call> |
842 | </menu> | 824 | </menu> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml index 6af19ee..d207a74 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notify.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml | |||
@@ -579,6 +579,9 @@ to his or her location: | |||
579 | <option name="Decline"> | 579 | <option name="Decline"> |
580 | Decline | 580 | Decline |
581 | </option> | 581 | </option> |
582 | <option name="Ignore"> | ||
583 | Ignore | ||
584 | </option> | ||
582 | </notify> | 585 | </notify> |
583 | <notify name="OfferFriendshipNoMessage" tip="false"> | 586 | <notify name="OfferFriendshipNoMessage" tip="false"> |
584 | <message name="message"> | 587 | <message name="message"> |
@@ -593,6 +596,9 @@ see each other's online status.) | |||
593 | <option name="Decline"> | 596 | <option name="Decline"> |
594 | Decline | 597 | Decline |
595 | </option> | 598 | </option> |
599 | <option name="Ignore"> | ||
600 | Ignore | ||
601 | </option> | ||
596 | </notify> | 602 | </notify> |
597 | <notify name="FriendshipAccepted" tip="false"> | 603 | <notify name="FriendshipAccepted" tip="false"> |
598 | <message name="message"> | 604 | <message name="message"> |
@@ -616,6 +622,9 @@ so you can quickly IM this resident. | |||
616 | <option name="Decline"> | 622 | <option name="Decline"> |
617 | Decline | 623 | Decline |
618 | </option> | 624 | </option> |
625 | <option name="Ignore"> | ||
626 | Ignore | ||
627 | </option> | ||
619 | </notify> | 628 | </notify> |
620 | <notify name="RegionRestartMinutes" tip="false"> | 629 | <notify name="RegionRestartMinutes" tip="false"> |
621 | <message name="message"> | 630 | <message name="message"> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml index 8c5cbb5..74d71f4 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml | |||
@@ -4,10 +4,10 @@ | |||
4 | <text bottom_delta="-78" height="54" left="7" width="200" name="help_text"> | 4 | <text bottom_delta="-78" height="54" left="7" width="200" name="help_text"> |
5 | You can select multiple residents to | 5 | You can select multiple residents to |
6 | invite to your group. Click 'Open | 6 | invite to your group. Click 'Open |
7 | Person Chooser' to start. | 7 | Resident Chooser' to start. |
8 | </text> | 8 | </text> |
9 | <button bottom_delta="-10" font="SansSerifSmall" halign="center" height="20" | 9 | <button bottom_delta="-10" font="SansSerifSmall" halign="center" height="20" |
10 | label="Open Person Chooser" left="5" name="add_button" tool_tip="" | 10 | label="Open Resident Chooser" left="5" name="add_button" tool_tip="" |
11 | width="200" /> | 11 | width="200" /> |
12 | <name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-178" | 12 | <name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-178" |
13 | column_padding="0" draw_border="true" height="174" left="5" | 13 | column_padding="0" draw_border="true" height="174" left="5" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml index 53f847a..bd64622 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml | |||
@@ -80,7 +80,7 @@ execute the Ability. | |||
80 | <column label="Last Login" name="online" width="116" /> | 80 | <column label="Last Login" name="online" width="116" /> |
81 | </name_list> | 81 | </name_list> |
82 | <button bottom_delta="-20" font="SansSerif" halign="center" height="19" | 82 | <button bottom_delta="-20" font="SansSerif" halign="center" height="19" |
83 | label="Invite New Person ..." left="4" name="member_invite" width="146" /> | 83 | label="Invite New Member ..." left="4" name="member_invite" width="146" /> |
84 | <button bottom_delta="0" font="SansSerif" halign="center" height="19" | 84 | <button bottom_delta="0" font="SansSerif" halign="center" height="19" |
85 | label="Eject From Group" left="-153" name="member_eject" width="146" /> | 85 | label="Eject From Group" left="-153" name="member_eject" width="146" /> |
86 | <string name="help_text"> | 86 | <string name="help_text"> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml index 6fa099e..c47985b 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml | |||
@@ -25,15 +25,15 @@ | |||
25 | label="IM/Call" left_delta="0" name="IM" | 25 | label="IM/Call" left_delta="0" name="IM" |
26 | tool_tip="Open Instant Message session" width="80" /> | 26 | tool_tip="Open Instant Message session" width="80" /> |
27 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" | 27 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" |
28 | label="Info" name="Info" width="80" /> | ||
29 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" | ||
30 | label="Activate" name="Activate" width="80" /> | 28 | label="Activate" name="Activate" width="80" /> |
31 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" | 29 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" |
32 | label="Leave" name="Leave" width="80" /> | 30 | label="Invite..." name="Invite..." width="80" /> |
31 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" | ||
32 | label="Info" name="Info" width="80" /> | ||
33 | <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22" | 33 | <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22" |
34 | label="Create..." name="Create" width="80" /> | 34 | label="Create..." name="Create" width="80" /> |
35 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" | 35 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" |
36 | label="Search..." name="Search..." width="80" /> | 36 | label="Search..." name="Search..." width="80" /> |
37 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" | 37 | <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22" |
38 | label="Invite..." name="Invite..." width="80" /> | 38 | label="Leave" name="Leave" width="80" /> |
39 | </panel> | 39 | </panel> |