diff options
Diffstat (limited to 'indra/newview/skins/default')
9 files changed, 192 insertions, 63 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml index 29f8b49794..fb0994b4cd 100644 --- a/indra/newview/skins/default/xui/en/floater_auction.xml +++ b/indra/newview/skins/default/xui/en/floater_auction.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater can_resize="true" - height="368" + height="412" layout="topleft" - min_height="368" + min_height="412" min_width="420" name="floater_auction" help_topic="floater_auction" @@ -49,21 +49,47 @@ left_delta="0" name="snapshot_btn" top_pad="4" - width="96"> + width="150"> <button.commit_callback function="ClickSnapshot" /> </button> <button follows="left|bottom" height="20" - label="OK" - label_selected="OK" + label="Sell to Anyone" + label_selected="Sell to Anyone" + layout="topleft" + left_delta="0" + name="sell_to_anyone_btn" + top_pad="4" + width="150"> + <button.commit_callback + function="ClickSellToAnyone" /> + </button> + <button + follows="left|bottom" + height="20" + label="Clear Settings" + label_selected="Clear Settings" + layout="topleft" + left_delta="0" + name="reset_parcel_btn" + top_pad="4" + width="150"> + <button.commit_callback + function="ClickResetParcel" /> + </button> + <button + follows="left|bottom" + height="20" + label="Start Auction" + label_selected="Start Auction" layout="topleft" left_pad="4" - name="ok_btn" + name="start_auction_btn" top_delta="0" - width="48"> + width="150"> <button.commit_callback - function="ClickOK" /> + function="ClickStartAuction" /> </button> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index a243cb399e..5ee136c422 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -49,7 +49,7 @@ layout="topleft" left="80" name="Discard" - top="302" + top="283" width="100" /> <button follows="left|bottom" @@ -68,8 +68,66 @@ layout="topleft" left="13" name="dimensions" - top="287" + top="309" width="303"> [WIDTH]px x [HEIGHT]px </text> + <text + type="string" + length="1" + bg_visible="false" + border_drop_shadow_visible="false" + border_visible="false" + top="309" + drop_shadow_visible="true" + enabled="true" + follows="right|bottom" + font="SansSerifSmall" + h_pad="0" + halign="right" + height="14" + left="54" + mouse_opaque="true" + name="aspect_ratio" + v_pad="0" + width="110"> + Preview Aspect Ratio + </text> + <combo_box + allow_text_entry="true" + top="306" + follows="right|bottom" + height="20" + left="176" + max_chars="20" + mouse_opaque="true" + enabled="true" + width="108" + name="combo_aspect_ratio" + tool_tip="Preview at a fixed aspect ratio"> + <combo_item name="Unconstrained" value="Unconstrained"> + Unconstrained + </combo_item> + <combo_item name="1:1" value="1:1" tool_tip="Group Insignia or 1st Life Profile"> + 1:1 + </combo_item> + <combo_item name="4:3" value="4:3" tool_tip="2nd Life Profile"> + 4:3 + </combo_item> + <combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks"> + 10:7 + </combo_item> + <combo_item name="3:2" value="3:2" tool_tip="About land"> + 3:2 + </combo_item> + <combo_item name="16:10" value="16:10"> + 16:10 + </combo_item> + <combo_item name="16:9" value="16:9" tool_tip="Profile Picks"> + 16:9 + </combo_item> + <combo_item name="2:1" value="2:1"> + 2:1 + </combo_item> + </combo_box> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 32456c00ee..80750b140a 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -722,7 +722,6 @@ </button> <text type="string" - text_color="LabelSelectedDisabledColor" length="1" height="12" follows="left|top" @@ -736,7 +735,6 @@ </text> <text type="string" - text_color="LabelSelectedDisabledColor" length="1" follows="left|top" halign="right" diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index bd76b10312..4386c0c5ee 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -417,7 +417,8 @@ left_delta="0" name="search_results" top_pad="10" - width="222"> + width="222" + sort_column="1"> <scroll_list.columns label="" name="icon" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 57ea24ac0e..b30597bcb6 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -355,7 +355,8 @@ label="World Map" layout="topleft" name="World Map" - shortcut="control|M"> + shortcut="control|M" + use_mac_ctrl="true"> <menu_item_check.on_check function="Floater.Visible" parameter="world_map" /> @@ -981,6 +982,57 @@ </menu_item_check> </menu> </menu> + <menu + create_jump_keys="true" + label="Select Linked Parts" + layout="topleft" + name="Select Linked Parts" + tear_off="true"> + <menu_item_call + label="Select Next Part" + layout="topleft" + name="Select Next Part" + shortcut="control|."> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="next" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + <menu_item_call + label="Select Previous Part" + layout="topleft" + name="Select Previous Part" + shortcut="control|,"> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="previous" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + <menu_item_call + label="Include Next Part" + layout="topleft" + name="Include Next Part" + shortcut="control|shift|."> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="includenext" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + <menu_item_call + label="Include Previous Part" + layout="topleft" + name="Include Previous Part" + shortcut="control|shift|,"> + <menu_item_call.on_click + function="Tools.SelectNextPart" + parameter="includeprevious" /> + <menu_item_call.on_enable + function="Tools.EnableSelectNextPart" /> + </menu_item_call> + </menu> </menu> <menu label="Help" @@ -1603,7 +1655,8 @@ label="Texture Console" layout="topleft" name="Texture Console" - shortcut="control|shift|3"> + shortcut="control|shift|3" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="texture" /> @@ -1615,7 +1668,8 @@ label="Debug Console" layout="topleft" name="Debug Console" - shortcut="control|shift|4"> + shortcut="control|shift|4" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="debug" /> @@ -1627,7 +1681,8 @@ label="Fast Timers" layout="topleft" name="Fast Timers" - shortcut="control|shift|9"> + shortcut="control|shift|9" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="fast timers" /> @@ -1639,7 +1694,8 @@ label="Memory" layout="topleft" name="Memory" - shortcut="control|shift|0"> + shortcut="control|shift|0" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="memory view" /> @@ -1651,7 +1707,8 @@ label="Notifications Console" layout="topleft" name="Notifications" - shortcut="control|shift|5"> + shortcut="control|shift|5" + use_mac_ctrl="true"> <menu_item_check.on_check function="Advanced.CheckConsole" parameter="notifications" /> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 91c19badfa..217178a5ef 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -485,6 +485,20 @@ You do not have enough L$ to join this group. <notification icon="alertmodal.tga" + name="CreateGroupCost" + type="alertmodal"> +Creating this group will cost L$100. +Groups need more than one member, or they are deleted forever. +Please invite members within 48 hours. + <usetemplate + canceltext="Cancel" + name="okcancelbuttons" + notext="Cancel" + yestext="Create group for L$100"/> + </notification> + + <notification + icon="alertmodal.tga" name="LandBuyPass" type="alertmodal"> For L$[COST] you can enter this land ('[PARCEL_NAME]') for [TIME] hours. Buy a pass? @@ -493,7 +507,7 @@ For L$[COST] you can enter this land ('[PARCEL_NAME]') for [TIME] hour notext="Cancel" yestext="OK"/> </notification> - + <notification icon="alertmodal.tga" name="SalePriceRestriction" @@ -6487,20 +6501,6 @@ The SLurl you clicked on is not supported. <button index="0" name="respondbutton" text="Respond"/> </form> </notification> - - <notification - icon="alertmodal.tga" - name="CreateGroupCost" - type="alertmodal"> -Creating this group will cost L$100. -Groups need more than one member, or they are deleted forever. -Please invite members within 48 hours. - <usetemplate - canceltext="Cancel" - name="okcancelbuttons" - notext="Cancel" - yestext="Create group for L$100"/> - </notification> <notification icon="notifytip.tga" name="AttachmentSaved" type="notifytip"> diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index 9a4480127d..6f01202680 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -212,4 +212,4 @@ Hover your mouse over the options for more help. value="Not Mature" /> </combo_box> </panel> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 06ecfdc995..f7d7d52b68 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -217,7 +217,7 @@ My Avatar: width="237" top_pad="0"/> <check_box - control_name="TapTapHoldtoRun" + control_name="AllowTapTapHoldRun" height="20" label="Tap-tap-hold to run" layout="topleft" @@ -225,36 +225,15 @@ My Avatar: name="tap_tap_hold_to_run" width="237" top_pad="0"/> - <!--menu_item_check - label="Tap-Tap-Hold to Run" - layout="topleft" - name="Tap-Tap-Hold to Run"> - <menu_item_check.on_check - function="Advanced.CheckAllowTapTapHoldRun" - parameter="TapTapHoldRun" /> - <menu_item_check.on_click - function="Advanced.ToggleAllowTapTapHoldRun" /> - </menu_item_check--> <check_box - control_name="EnableLipSync" + control_name="LipSyncEnabled" height="20" - label="Move my avatar's lips when speaking" + label="Move avatar lips when speaking" layout="topleft" left_delta="0" name="enable_lip_sync" width="237" top_pad="0" /> - <!--menu_item_check - label="Enable Lip Sync(Beta)" - layout="topleft" - name="Enable Lip Sync(Beta)"> - <menu_item_check.on_check - function="CheckControl" - parameter="LipSyncEnabled" /> - <menu_item_check.on_click - function="ToggleControl" - parameter="LipSyncEnabled" /> - </menu_item_check--> <check_box control_name="test" height="20" @@ -293,4 +272,4 @@ My Avatar: </radio_group> -</panel>
\ No newline at end of file +</panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f620e8f2d7..360fd3c2db 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -230,8 +230,10 @@ <string name="anim_yes_happy">Yes (Happy)</string> <string name="anim_yes_head">Yes</string> + <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> + <string name="worldmap_results_none_found">None found.</string> <!-- animations uploading status codes --> <string name="Ok">OK</string> @@ -2110,6 +2112,15 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh <string name="AddLandmarkNavBarMenu">Add Landmark...</string> <string name="EditLandmarkNavBarMenu">Edit Landmark...</string> + <!-- menu accelerators --> + <string name="accel-mac-control">Ctrl-</string> + <string name="accel-mac-command">Cmd-</string> + <string name="accel-mac-option">Opt-</string> + <string name="accel-mac-shift">Shift-</string> + <string name="accel-win-control">Ctrl+</string> + <string name="accel-win-alt">Alt+</string> + <string name="accel-win-shift">Shift+</string> + <!-- Previews --> <string name="FileSaved">File Saved</string> <string name="Receiving">Receiving</string> @@ -2225,9 +2236,8 @@ Running in window. <string name="MBPixelFmtErr">Can't find suitable pixel format</string> <string name="MBPixelFmtDescErr">Can't get pixel format description</string> <string name="MBTrueColorWindow"> - [APP_NAME] requires True Color (32-bit) to run in a window. -Please go to Control Panels > Display > Settings and set the screen to 32-bit color. -Alternately, if you choose to run fullscreen, [APP_NAME] will automatically adjust the screen each time it runs. + [APP_NAME] requires True Color (32-bit) to run. +Please go to your computer's display settings and set the color mode to 32-bit. </string> <string name="MBAlpha"> [APP_NAME] is unable to run because it can't get an 8 bit alpha channel. Usually this is due to video card driver issues. |