diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
116 files changed, 347 insertions, 21 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index bf8988ca45..6d64d13db7 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -3,6 +3,7 @@ height="440" layout="topleft" name="floater_aaa" + help_topic="floater_aaa" save_rect="true" can_resize="true" title="About [APP_NAME]" diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 9e5ac1d201..bfa979ab6f 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -3,6 +3,7 @@ height="440" layout="topleft" name="floater_about" + help_topic="floater_about" save_rect="true" title="About [APP_NAME]" width="470"> diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 63abb63bdf..f11391c5e0 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -4,6 +4,7 @@ height="420" layout="topleft" name="floaterland" + help_topic="floaterland" save_rect="true" title="About Land" width="460"> diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml index 0af4e1db54..f81250e7b9 100644 --- a/indra/newview/skins/default/xui/en/floater_activeim.xml +++ b/indra/newview/skins/default/xui/en/floater_activeim.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater name="floater_activeim" + help_topic="floater_activeim" title="ACTIVE IM" top="26" left="0" diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml index 57412ae209..3a2337bfff 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -4,6 +4,7 @@ height="556" layout="topleft" name="Animation Preview" + help_topic="animation_preview" width="280"> <floater.string name="failed_to_initialize"> diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml index 32d3f4fd7e..29f8b49794 100644 --- a/indra/newview/skins/default/xui/en/floater_auction.xml +++ b/indra/newview/skins/default/xui/en/floater_auction.xml @@ -6,6 +6,7 @@ min_height="368" min_width="420" name="floater_auction" + help_topic="floater_auction" title="Start Linden Land Sale" width="420"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml index b36e18093e..3ab5c18300 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml @@ -6,6 +6,7 @@ min_height="200" min_width="265" name="avatarpicker" + help_topic="avatarpicker" title="Choose Resident" width="265"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml index 9e2c8a44d1..f6b965f139 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml @@ -3,6 +3,7 @@ height="950" layout="topleft" name="avatar_texture_debug" + help_topic="avatar_texture_debug" title="Avatar Textures" width="960"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml index ea41289769..afbbeb4833 100644 --- a/indra/newview/skins/default/xui/en/floater_beacons.xml +++ b/indra/newview/skins/default/xui/en/floater_beacons.xml @@ -3,6 +3,7 @@ height="225" layout="topleft" name="beacons" + help_topic="beacons" save_rect="true" save_visibility="true" single_instance="true" diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index f96aea3d90..a65a159bd5 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -4,6 +4,7 @@ height="140" layout="topleft" name="build options floater" + help_topic="build_options_floater" save_rect="true" title="Grid Options" width="245"> diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index 6cb90f5c05..897e5da4e8 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -4,6 +4,7 @@ height="310" layout="topleft" name="floaterbulkperms" + help_topic="floaterbulkperms" title="Edit Content Permissions" width="270"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml index 4fb2fe24cc..d1f6706875 100644 --- a/indra/newview/skins/default/xui/en/floater_bumps.xml +++ b/indra/newview/skins/default/xui/en/floater_bumps.xml @@ -3,6 +3,7 @@ height="180" layout="topleft" name="floater_bumps" + help_topic="floater_bumps" save_rect="true" title="Bumps, Pushes & Hits" width="400"> diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml index 0930043659..8d27ae894b 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml @@ -6,6 +6,7 @@ min_height="150" min_width="200" name="floater_buy_contents" + help_topic="floater_buy_contents" save_rect="true" title="Buy Contents" width="280"> diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index e2bdc756a9..52c7944ba9 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -4,6 +4,7 @@ height="270" layout="topleft" name="buy currency" + help_topic="buy_currency" single_instance="true" title="Buy Currency" width="350"> diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index 5e0e423128..bd0dac5ca1 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -4,6 +4,7 @@ height="484" layout="topleft" name="buy land" + help_topic="buy_land" single_instance="true" title="Buy Land" width="740"> diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml index 505411b964..0b4684e8ba 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_object.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml @@ -6,6 +6,7 @@ min_height="175" min_width="154" name="contents" + help_topic="contents" save_rect="true" single_instance="true" title="Buy Copy of Object" diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index ac00ee7a76..4a8830ed5a 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -7,6 +7,7 @@ height="95" layout="topleft" name="camera_floater" + help_topic="camera_floater" save_rect="true" save_visibility="true" width="105"> diff --git a/indra/newview/skins/default/xui/en/floater_choose_group.xml b/indra/newview/skins/default/xui/en/floater_choose_group.xml index 428afcff52..371e239fdb 100644 --- a/indra/newview/skins/default/xui/en/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/en/floater_choose_group.xml @@ -3,6 +3,7 @@ height="258" layout="topleft" name="groups" + help_topic="groups" title="Groups" width="280"> <text diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml index cda2020fca..f2146339a7 100644 --- a/indra/newview/skins/default/xui/en/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml @@ -5,6 +5,7 @@ height="380" layout="topleft" name="ColorPicker" + help_topic="colorpicker" title="Color Picker" width="440"> <text diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 5475a1cf6a..7d1a1113b0 100644 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml @@ -5,6 +5,7 @@ height="500" layout="topleft" name="modal container" + help_topic="modal_container" width="600"> <button height="20" diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index 4463d44049..3b6d5452e3 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -6,6 +6,7 @@ layout="topleft" left_delta="-3" name="floater customize" + help_topic="floater_customize" save_rect="true" title="Appearance" top_delta="-185" diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml index 9ca7172f81..b044cd41e6 100644 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml @@ -3,6 +3,7 @@ height="275" layout="topleft" name="Day Cycle Floater" + help_topic="day_cycle_floater" save_rect="true" title="Day Cycle Editor" width="646"> diff --git a/indra/newview/skins/default/xui/en/floater_device_settings.xml b/indra/newview/skins/default/xui/en/floater_device_settings.xml index fa0cce3795..8901608374 100644 --- a/indra/newview/skins/default/xui/en/floater_device_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_device_settings.xml @@ -3,6 +3,7 @@ height="260" layout="topleft" name="floater_device_settings" + help_topic="floater_device_settings" title="Voice Chat Device Settings" width="405"> <panel diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml index 5aa7809208..5e87e065a4 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -3,6 +3,7 @@ height="150" layout="topleft" name="Environment Editor Floater" + help_topic="environment_editor_floater" save_rect="true" title="Environment Editor" width="600"> diff --git a/indra/newview/skins/default/xui/en/floater_first_time_tip.xml b/indra/newview/skins/default/xui/en/floater_first_time_tip.xml index c16373ba3c..4975111111 100644 --- a/indra/newview/skins/default/xui/en/floater_first_time_tip.xml +++ b/indra/newview/skins/default/xui/en/floater_first_time_tip.xml @@ -5,6 +5,7 @@ height="250" layout="topleft" name="set_name_in_the_cladd" + help_topic="set_name_in_the_cladd" save_rect="true" width="300"> <check_box diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml index 744d434982..6f9038df62 100644 --- a/indra/newview/skins/default/xui/en/floater_font_test.xml +++ b/indra/newview/skins/default/xui/en/floater_font_test.xml @@ -6,6 +6,7 @@ min_height="175" min_width="154" name="contents" + help_topic="contents" title="Font Test" width="500"> <text diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index f042385fb4..052398bcd3 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -6,6 +6,7 @@ min_height="200" min_width="280" name="gestures" + help_topic="gestures" title="Active Gestures" width="280"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index e3bea2e2d6..615c35e6c3 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -3,6 +3,7 @@ height="384" layout="topleft" name="godtools floater" + help_topic="godtools_floater" title="God Tools" width="400"> <tab_container diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index b7733c6388..70f296b606 100644 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -3,6 +3,7 @@ height="224" layout="topleft" name="Hardware Settings Floater" + help_topic="hardware_settings_floater" title="Hardware Settings" width="500"> <text diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml new file mode 100644 index 0000000000..a1265d49f9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -0,0 +1,213 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="true" + height="440" + layout="topleft" + min_height="140" + min_width="467" + name="floater_help_browser" + help_topic="floater_help_browser" + save_rect="true" + single_instance="true" + title="Holy Bananas, it's the Help Browser" + width="820"> + <floater.string + name="home_page_url"> + http://www.secondlife.com + </floater.string> + <floater.string + name="support_page_url"> + http://support.secondlife.com + </floater.string> + <layout_stack + bottom="440" + follows="left|right|top|bottom" + layout="topleft" + left="10" + name="stack1" + top="20" + width="800"> + <layout_panel + auto_resize="false" + height="20" + layout="topleft" + left="0" + name="nav_controls" + top="400" + user_resize="false" + width="800"> + <button + follows="left|top" + height="20" + label="Back" + layout="topleft" + left="0" + name="back" + top="0" + width="55" /> + <button + follows="left|top" + height="20" + label="Forward" + layout="topleft" + left_pad="3" + name="forward" + top_delta="0" + width="68" /> + <button + enabled="false" + follows="left|top" + height="20" + label="Reload" + layout="topleft" + left_pad="2" + name="reload" + top_delta="0" + width="70"/> + <combo_box + allow_text_entry="true" + follows="left|top|right" + height="20" + layout="topleft" + left_pad="5" + max_chars="255" + name="address" + top_delta="0" + width="540" /> + <button + enabled="false" + follows="right|top" + height="20" + label="Go" + layout="topleft" + left_pad="5" + name="go" + top_delta="0" + width="55" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="20" + layout="topleft" + left_delta="0" + name="time_controls" + top_delta="0" + user_resize="false" + width="800"> + <button + follows="left|top" + height="20" + label="rewind" + layout="topleft" + left="0" + name="rewind" + top="0" + width="55" /> + <button + follows="left|top" + height="20" + image_selected="button_anim_play_selected.tga" + image_unselected="button_anim_play.tga" + layout="topleft" + left_delta="55" + name="play" + picture_style="true" + top_delta="0" + width="55" /> + <button + follows="left|top" + height="20" + image_selected="button_anim_pause_selected.tga" + image_unselected="button_anim_pause.tga" + layout="topleft" + left_delta="0" + name="pause" + picture_style="true" + top_delta="0" + width="55" /> + <button + follows="left|top" + height="20" + label="stop" + layout="topleft" + left_pad="10" + name="stop" + top_delta="0" + width="55" /> + <button + follows="left|top" + height="20" + label="forward" + layout="topleft" + left_pad="20" + name="seek" + top_delta="0" + width="55" /> + </layout_panel> + <layout_panel + auto_resize="false" + height="20" + layout="topleft" + left_delta="0" + name="parcel_owner_controls" + top_delta="0" + user_resize="false" + width="540"> + <button + enabled="false" + follows="left|top" + height="20" + label="Send Current URL to Parcel" + layout="topleft" + left="0" + name="assign" + top="0" + width="200" /> + </layout_panel> + <layout_panel + height="20" + layout="topleft" + left_delta="0" + name="external_controls" + top_delta="0" + user_resize="false" + width="540"> + <web_browser + bottom="-10" + follows="left|right|top|bottom" + layout="topleft" + left="0" + name="browser" + top="0" + width="540" /> + <button + follows="bottom|left" + height="20" + label="Open in My Web Browser" + layout="topleft" + left_delta="0" + name="open_browser" + top_pad="5" + width="185" /> + <check_box + control_name="UseExternalBrowser" + follows="bottom|left" + height="20" + label="Always open in my web browser" + layout="topleft" + left_pad="5" + name="open_always" + top_delta="0" + width="200" /> + <button + follows="bottom|right" + height="20" + label="Close" + layout="topleft" + left_pad="80" + name="close" + top_delta="0" + width="70" /> + </layout_panel> + </layout_stack> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_hud.xml b/indra/newview/skins/default/xui/en/floater_hud.xml index 73804f90a5..23e0ef50fd 100644 --- a/indra/newview/skins/default/xui/en/floater_hud.xml +++ b/indra/newview/skins/default/xui/en/floater_hud.xml @@ -4,6 +4,7 @@ height="292" layout="topleft" name="floater_hud" + help_topic="floater_hud" save_rect="true" save_visibility="true" title="Tutorial" diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml index e8b8fee678..b6cf05aefc 100644 --- a/indra/newview/skins/default/xui/en/floater_im.xml +++ b/indra/newview/skins/default/xui/en/floater_im.xml @@ -7,6 +7,7 @@ min_height="130" min_width="350" name="im_floater" + help_topic="im_floater" save_rect="true" title="Instant Message" width="419"> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index ae9e658688..a5d76821a8 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -6,6 +6,7 @@ layout="topleft" left="0" name="panel_im" + help_topic="panel_im" top="0" can_dock="true" can_minimize="false" diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml index 6fface12a3..4e4fe97e62 100644 --- a/indra/newview/skins/default/xui/en/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml @@ -4,6 +4,7 @@ height="440" layout="topleft" name="Image Preview" + help_topic="image_preview" width="300"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml index 2e7f5e6c42..8b271eb41e 100644 --- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml @@ -6,6 +6,7 @@ height="200" layout="topleft" name="incoming call" + help_topic="incoming_call" title="Unknown Person is calling" width="240"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index b43cdca0d1..00b9f850ad 100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml @@ -6,6 +6,7 @@ min_height="300" min_width="400" name="inspect" + help_topic="inspect" save_rect="true" title="Inspect Objects" width="400"> diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml index e94ca1b30b..4826941b58 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory.xml @@ -7,6 +7,7 @@ min_height="150" min_width="240" name="Inventory" + help_topic="inventory" save_rect="true" save_visibility="true" single_instance="true" diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml index 10bcee7c85..2882f233c2 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml @@ -4,6 +4,7 @@ height="340" layout="topleft" name="item properties" + help_topic="item_properties" save_rect="true" title="Inventory Item Properties" width="350"> diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index f3d0f37c01..6556a14730 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml @@ -4,6 +4,7 @@ height="408" layout="topleft" name="Inventory Finder" + help_topic="inventory_finder" title="inventory_recent_items" width="280"> <icon diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml index b9c1b08c68..c0bcfd2271 100644 --- a/indra/newview/skins/default/xui/en/floater_joystick.xml +++ b/indra/newview/skins/default/xui/en/floater_joystick.xml @@ -3,6 +3,7 @@ height="500" layout="topleft" name="Joystick" + help_topic="joystick" title="Joystick Configuration" width="550"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml index a326cd006f..3f5127561a 100644 --- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml @@ -3,6 +3,7 @@ height="150" layout="topleft" name="floater_lagmeter" + help_topic="floater_lagmeter" save_rect="true" title="Lag Meter" width="350"> @@ -325,7 +326,6 @@ bottom="145" follows="left|top" height="18" - help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417&task=knowledge&questionID=4851" label="?" layout="topleft" name="server_help" diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml index 60677ca0df..f887b48ed0 100644 --- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml +++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml @@ -3,6 +3,7 @@ height="400" layout="topleft" name="land holdings floater" + help_topic="land_holdings_floater" title="My Land" width="280"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml index 6d6c6c6644..fac8fdbefa 100644 --- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml +++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml @@ -9,6 +9,7 @@ min_height="271" min_width="290" name="script ed float" + help_topic="script_ed_float" save_rect="true" title="Script: New Script" width="500"> diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml index ce6b0efd03..fd2ee6ce5c 100644 --- a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml @@ -7,6 +7,7 @@ min_height="271" min_width="350" name="script ed float" + help_topic="script_ed_float" save_rect="true" title="LSL Wiki" width="370"> diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index ed3b00250b..70f9c19658 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -7,6 +7,7 @@ min_height="60" min_width="174" name="Map" + help_topic="map" save_rect="true" save_visibility="true" single_instance="true" diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 28b8139bfd..ad2c50c6d9 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -6,6 +6,7 @@ min_height="140" min_width="467" name="floater_about" + help_topic="floater_about" save_rect="true" single_instance="true" title="Media Browser" diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml index da698f276b..3ce41f5ec3 100644 --- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml @@ -5,6 +5,7 @@ height="175" layout="topleft" name="MemLeak" + help_topic="memleak" title="Memory Leaking Simulation" width="350"> <spinner diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml index 829dd2132f..b7006cf248 100644 --- a/indra/newview/skins/default/xui/en/floater_moveview.xml +++ b/indra/newview/skins/default/xui/en/floater_moveview.xml @@ -7,6 +7,7 @@ height="95" layout="topleft" name="move_floater" + help_topic="move_floater" save_rect="true" save_visibility="true" width="115"> diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml index 6b6b2c80ba..412df1d262 100644 --- a/indra/newview/skins/default/xui/en/floater_mute_object.xml +++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml @@ -4,6 +4,7 @@ height="140" layout="topleft" name="mute by name" + help_topic="mute_by_name" title="Block object by name" width="375"> <text diff --git a/indra/newview/skins/default/xui/en/floater_my_friends.xml b/indra/newview/skins/default/xui/en/floater_my_friends.xml index 65665c7036..a9a18f44c4 100644 --- a/indra/newview/skins/default/xui/en/floater_my_friends.xml +++ b/indra/newview/skins/default/xui/en/floater_my_friends.xml @@ -7,6 +7,7 @@ min_height="240" min_width="365" name="floater_my_friends" + help_topic="floater_my_friends" save_rect="true" single_instance="true" title="Contacts" diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 674bfa42da..78f795b0e2 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -7,6 +7,7 @@ height="300" layout="topleft" name="nearby_chat" + help_topic="nearby_chat" save_rect="true" title="Nearby Chat" single_instance="true" diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml index 34bda53ef1..3783417cdb 100644 --- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml +++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml @@ -5,6 +5,7 @@ layout="topleft" min_height="50" name="notifications_console" + help_topic="notifications_console" single_instance="true" title="Notifications Console" width="500"> diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml index e0ac2c1d51..ef6124b3ad 100644 --- a/indra/newview/skins/default/xui/en/floater_openobject.xml +++ b/indra/newview/skins/default/xui/en/floater_openobject.xml @@ -7,6 +7,7 @@ min_height="160" min_width="270" name="objectcontents" + help_topic="objectcontents" save_rect="true" title="Object Contents" width="300"> diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml index 96195c9ba1..ac5e4592b7 100644 --- a/indra/newview/skins/default/xui/en/floater_pay.xml +++ b/indra/newview/skins/default/xui/en/floater_pay.xml @@ -4,6 +4,7 @@ height="140" layout="topleft" name="Give Money" + help_topic="give_money" save_rect="true" width="300"> <button diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml index bb91f709a3..88dae0d20b 100644 --- a/indra/newview/skins/default/xui/en/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml @@ -4,6 +4,7 @@ height="140" layout="topleft" name="Give Money" + help_topic="give_money" save_rect="true" width="300"> <text diff --git a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml index e4cb97035c..f65bb6f32f 100644 --- a/indra/newview/skins/default/xui/en/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/en/floater_perm_prefs.xml @@ -3,6 +3,7 @@ height="180" layout="topleft" name="perm prefs" + help_topic="perm_prefs" save_rect="true" title="Default Upload Permissions" width="315"> diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml index 5a36ed5fd6..aaf7aecd6b 100644 --- a/indra/newview/skins/default/xui/en/floater_post_process.xml +++ b/indra/newview/skins/default/xui/en/floater_post_process.xml @@ -3,6 +3,7 @@ height="400" layout="topleft" name="Post-Process Floater" + help_topic="post_process_floater" title="Post-Process Settings" width="400"> <tab_container diff --git a/indra/newview/skins/default/xui/en/floater_postcard.xml b/indra/newview/skins/default/xui/en/floater_postcard.xml index 8657663057..d93cad6dbd 100644 --- a/indra/newview/skins/default/xui/en/floater_postcard.xml +++ b/indra/newview/skins/default/xui/en/floater_postcard.xml @@ -8,6 +8,7 @@ min_height="380" min_width="450" name="Postcard" + help_topic="postcard" title="Email Snapshot" width="450"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index bacec627e1..d655c268b2 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -6,6 +6,7 @@ height="460" layout="topleft" name="Preferences" + help_topic="preferences" single_instance="true" title="Preferences" width="620"> diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml index e9342b772f..5756f9590e 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml @@ -4,6 +4,7 @@ height="85" layout="topleft" name="preview_anim" + help_topic="preview_anim" width="280"> <floater.string name="Title"> diff --git a/indra/newview/skins/default/xui/en/floater_preview_classified.xml b/indra/newview/skins/default/xui/en/floater_preview_classified.xml index 6fac2823e8..07167c3ae4 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_classified.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_classified.xml @@ -4,6 +4,7 @@ height="510" layout="topleft" name="classified_preview" + help_topic="classified_preview" save_rect="true" title="Classified Information" width="440"> diff --git a/indra/newview/skins/default/xui/en/floater_preview_event.xml b/indra/newview/skins/default/xui/en/floater_preview_event.xml index 58dd43075d..77fbe7c060 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_event.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_event.xml @@ -4,6 +4,7 @@ height="510" layout="topleft" name="event_preview" + help_topic="event_preview" save_rect="true" title="Event Information" width="440"> diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml index c196bbe852..a523f40bb8 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml @@ -4,6 +4,7 @@ height="800" layout="topleft" name="gesture_preview" + help_topic="gesture_preview" width="280"> <floater.string name="step_anim"> diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml index b20a6fe868..43e4f8a348 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml @@ -5,6 +5,7 @@ height="155" layout="topleft" name="Gesture" + help_topic="gesture" save_rect="true" title="Gesture Shortcut" width="260"> diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml index 17b6766f67..606ae1a82a 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml @@ -5,6 +5,7 @@ height="90" layout="topleft" name="Gesture" + help_topic="gesture" save_rect="true" title="Gesture Shortcut" width="260"> diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml index a8f7e95aed..4b4f611b59 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml @@ -5,6 +5,7 @@ height="155" layout="topleft" name="Gesture" + help_topic="gesture" save_rect="true" title="Gesture Shortcut" width="260"> diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml index 3e2045e1f7..1d7b7adca2 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml @@ -9,6 +9,7 @@ min_height="243" min_width="234" name="preview notecard" + help_topic="preview_notecard" title="Note:" width="400"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml index e341dd7b97..4220655a6f 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml @@ -4,6 +4,7 @@ height="85" layout="topleft" name="preview_sound" + help_topic="preview_sound" width="280"> <floater.string name="Title"> 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 7bac6fdb32..a243cb399e 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -8,6 +8,7 @@ min_height="120" min_width="300" name="preview_texture" + help_topic="preview_texture" width="300"> <floater.string name="Title"> diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml index a890de3e28..e045b811f2 100644 --- a/indra/newview/skins/default/xui/en/floater_region_info.xml +++ b/indra/newview/skins/default/xui/en/floater_region_info.xml @@ -3,6 +3,7 @@ height="512" layout="topleft" name="regioninfo" + help_topic="regioninfo" save_rect="true" title="Region/Estate" width="280"> diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index 48fa8a14c6..c7f5a1170f 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -3,6 +3,7 @@ height="580" layout="topleft" name="floater_report_abuse" + help_topic="floater_report_abuse" title="Report Abuse" width="333"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml index 2ae0afa168..53d4925214 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml @@ -4,6 +4,7 @@ height="233" layout="topleft" name="script debug floater" + help_topic="script_debug_floater" save_rect="true" title="Script Warning/Error" width="450"> diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index 2dd7a1e777..c8b8c34f85 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml @@ -5,6 +5,7 @@ height="200" layout="topleft" name="script" + help_topic="script" short_title="[All scripts]" title="[All scripts]" width="440"> diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml index ef68478460..54ab30124a 100644 --- a/indra/newview/skins/default/xui/en/floater_script_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml @@ -8,6 +8,7 @@ min_height="271" min_width="290" name="preview lsl text" + help_topic="preview_lsl_text" save_rect="true" title="Script: Rotation Script" top_delta="0" diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml index ad91e8156b..467dcfae20 100644 --- a/indra/newview/skins/default/xui/en/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/en/floater_script_queue.xml @@ -5,6 +5,7 @@ height="400" layout="topleft" name="queue" + help_topic="queue" save_rect="true" title="Reset Progress" width="300"> diff --git a/indra/newview/skins/default/xui/en/floater_script_search.xml b/indra/newview/skins/default/xui/en/floater_script_search.xml index bb0c60e75b..545abc39a2 100644 --- a/indra/newview/skins/default/xui/en/floater_script_search.xml +++ b/indra/newview/skins/default/xui/en/floater_script_search.xml @@ -4,6 +4,7 @@ height="120" layout="topleft" name="script search" + help_topic="script_search" title="Script Search" width="300"> <check_box diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml index b89af0ef3e..8e1317440e 100644 --- a/indra/newview/skins/default/xui/en/floater_select_key.xml +++ b/indra/newview/skins/default/xui/en/floater_select_key.xml @@ -6,6 +6,7 @@ height="100" layout="topleft" name="modal container" + help_topic="modal_container" width="240"> <button height="20" diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 5075bc770a..f07b9d3767 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -4,6 +4,7 @@ height="450" layout="topleft" name="sell land" + help_topic="sell_land" single_instance="true" title="Sell Land" width="313"> diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml index 4d4dc084bf..e2f4a73ec8 100644 --- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml @@ -4,6 +4,7 @@ height="215" layout="topleft" name="settings_debug" + help_topic="settings_debug" title="Debug Settings" width="350"> <combo_box diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 1d2978adb8..bd1484c0fe 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -5,6 +5,7 @@ height="526" layout="topleft" name="Snapshot" + help_topic="snapshot" save_rect="true" title="Snapshot Preview" width="215"> diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml index 78540c0b98..3b1eae9293 100644 --- a/indra/newview/skins/default/xui/en/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_preview.xml @@ -3,6 +3,7 @@ height="190" layout="topleft" name="Sound Preview" + help_topic="sound_preview" title="sound.wav" width="300"> <text diff --git a/indra/newview/skins/default/xui/en/floater_statistics.xml b/indra/newview/skins/default/xui/en/floater_statistics.xml index 1661fbffb0..653bc942e5 100644 --- a/indra/newview/skins/default/xui/en/floater_statistics.xml +++ b/indra/newview/skins/default/xui/en/floater_statistics.xml @@ -6,5 +6,6 @@ layout="topleft" mouse_opaque="false" name="stats floater" + help_topic="stats_floater" title="Statistics" width="250" /> diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index 4d7da97f79..205e6efe70 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -5,6 +5,7 @@ height="400" layout="topleft" name="Statistics" + help_topic="statistics" save_rect="true" save_visibility="true" title="Statistics" diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml index 76b2e5c811..3f31641cac 100644 --- a/indra/newview/skins/default/xui/en/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml @@ -6,6 +6,7 @@ follows="right|bottom" layout="topleft" name="notification_chiclet" + help_topic="notification_chiclet" save_rect="true" title="NOTIFICATIONS" width="320" diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml index ef9aef7f6f..b703b49b8b 100644 --- a/indra/newview/skins/default/xui/en/floater_telehub.xml +++ b/indra/newview/skins/default/xui/en/floater_telehub.xml @@ -3,6 +3,7 @@ height="250" layout="topleft" name="telehub" + help_topic="telehub" title="Telehub" width="280"> <text diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml index 81247a387c..ce17873a67 100644 --- a/indra/newview/skins/default/xui/en/floater_test_button.xml +++ b/indra/newview/skins/default/xui/en/floater_test_button.xml @@ -4,6 +4,7 @@ height="500" layout="topleft" name="floater_test_button" + help_topic="floater_test_button" width="500"> <button height="23" diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml index bedbc9d563..66a5b9267d 100644 --- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml @@ -4,6 +4,7 @@ height="400" layout="topleft" name="floater_test_checkbox" + help_topic="floater_test_checkbox" width="400"> <check_box control_name="ShowStartLocation" diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml index 06422d6a26..956d5669b8 100644 --- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml @@ -4,6 +4,7 @@ height="400" layout="topleft" name="floater_test_combobox" + help_topic="floater_test_combobox" width="400"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml index b23bf49435..a1a271d0eb 100644 --- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml +++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml @@ -4,6 +4,7 @@ height="400" layout="topleft" name="floater_test_inspectors" + help_topic="floater_test_inspectors" title="Test Inspectors" width="400"> <text diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml index 344ad8447e..209859bb29 100644 --- a/indra/newview/skins/default/xui/en/floater_test_layout.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout.xml @@ -4,6 +4,7 @@ height="500" layout="topleft" name="floater_test_layout" + help_topic="floater_test_layout" width="500"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml index a17e3ea949..251ca4c9bf 100644 --- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml @@ -4,6 +4,7 @@ height="400" layout="topleft" name="floater_test_line_editor" + help_topic="floater_test_line_editor" width="400"> <line_editor height="20" diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml index b637699228..98d6d5bda7 100644 --- a/indra/newview/skins/default/xui/en/floater_test_list_view.xml +++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml @@ -4,6 +4,7 @@ height="400" layout="topleft" name="floater_test_list_view" + help_topic="floater_test_list_view" width="400"> <list_view height="300" diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml index 21956c2eac..dd551b6d51 100644 --- a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml @@ -4,6 +4,7 @@ height="200" layout="topleft" name="floater_test_navigation_bar" + help_topic="floater_test_navigation_bar" width="900"> <panel name="navigation_bar" diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml index ef3e1f598d..35190c0e1a 100644 --- a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml +++ b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml @@ -4,6 +4,7 @@ height="400" layout="topleft" name="floater_test_radiogroup" + help_topic="floater_test_radiogroup" width="400"> <radio_group height="54" diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml index b1d468e265..3545f88df7 100644 --- a/indra/newview/skins/default/xui/en/floater_test_slider.xml +++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml @@ -4,6 +4,7 @@ height="400" layout="topleft" name="floater_test_slider" + help_topic="floater_test_slider" width="450"> <slider height="20" diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml index 752ed81f65..c4e5bc9e99 100644 --- a/indra/newview/skins/default/xui/en/floater_test_spinner.xml +++ b/indra/newview/skins/default/xui/en/floater_test_spinner.xml @@ -4,6 +4,7 @@ height="400" layout="topleft" name="floater_test_spinner" + help_topic="floater_test_spinner" width="450"> <spinner height="32" diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml index b4f3fc1e78..88c001b714 100644 --- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml @@ -4,6 +4,7 @@ height="400" layout="topleft" name="floater_test_textbox" + help_topic="floater_test_textbox" width="400"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index d773e1f2b8..6ddaa63c1d 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -21,6 +21,7 @@ height="500" layout="topleft" name="floater_test_widgets" + help_topic="floater_test_widgets" width="850"> <!-- Strings are used by C++ code for localization. They are not visible diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml index dc048eb352..f2b701b88d 100644 --- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml @@ -7,6 +7,7 @@ min_height="290" min_width="410" name="texture picker" + help_topic="texture_picker" title="Pick: Texture" width="410"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index e373da300c..327dc07cbe 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -4,6 +4,7 @@ height="570" layout="topleft" name="toolbox floater" + help_topic="toolbox_floater" save_rect="true" short_title="Build Tools" single_instance="true" diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index ecd64d08e6..07ffc204f9 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -6,6 +6,7 @@ min_height="300" min_width="450" name="top_objects" + help_topic="top_objects" title="loading..." width="550"> <floater.string diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml index 54facbb659..b290a9c87d 100644 --- a/indra/newview/skins/default/xui/en/floater_tos.xml +++ b/indra/newview/skins/default/xui/en/floater_tos.xml @@ -5,6 +5,7 @@ height="500" layout="topleft" name="modal container" + help_topic="modal_container" width="600"> <floater.string name="real_url"> diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml index bbb17dfb8f..2c14b3d87a 100644 --- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml @@ -6,6 +6,7 @@ min_height="230" min_width="650" name="gui_preview_tool" + help_topic="gui_preview_tool" single_instance="true" title="XUI Preview Tool" width="750"> diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml index cf59d44d01..6c1fb65bdd 100644 --- a/indra/newview/skins/default/xui/en/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml @@ -4,6 +4,7 @@ height="87" layout="topleft" name="url_entry" + help_topic="url_entry" width="280"> <text type="string" diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml index 07ebf734ea..febfd1929e 100644 --- a/indra/newview/skins/default/xui/en/floater_water.xml +++ b/indra/newview/skins/default/xui/en/floater_water.xml @@ -3,6 +3,7 @@ height="240" layout="topleft" name="Water Floater" + help_topic="water_floater" save_rect="true" title="Advanced Water Editor" width="700"> diff --git a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml index ee67989d33..e698dfe2dc 100644 --- a/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/en/floater_wearable_save_as.xml @@ -6,6 +6,7 @@ height="100" layout="topleft" name="modal container" + help_topic="modal_container" width="240"> <button height="20" diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml index 5257cc687e..872bd704d5 100644 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml @@ -3,6 +3,7 @@ height="220" layout="topleft" name="WindLight floater" + help_topic="windlight_floater" save_rect="true" title="Advanced Sky Editor" width="700"> 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 e46588dd71..bd76b10312 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -8,6 +8,7 @@ min_height="520" min_width="520" name="worldmap" + help_topic="worldmap" save_rect="true" save_visibility="true" single_instance="true" diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index f908e9d610..643a1d06e6 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -13,6 +13,7 @@ can_close="false" can_minimize="false" name="inspect_avatar" + help_topic="inspect_avatar" single_instance="true" sound_flags="0" title="" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 9306f83dde..ee15e6f29c 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2555,14 +2555,6 @@ function="Advanced.WebBrowserTest" /> </menu_item_call> <menu_item_call - label="Simple Web Browser Test" - layout="topleft" - name="Simple Web Browser Test"> - <menu_item_call.on_click - function="Floater.Show" - parameter="html_simple.http://www.secondlife.com" /> - </menu_item_call> - <menu_item_call label="UI/Color Settings" layout="topleft" name="UI/Color Settings"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9a012bcfa9..80d501b63e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6529,6 +6529,13 @@ Click Accept to join the chat or Decline to decline the invitation. Click Block Attachment has been saved. </notification> + <notification + icon="alertmodal.tga" + name="UnableToFindHelpTopic" + type="alertmodal"> +Unable to find the help topic for this element. + </notification> + <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. </global> diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index b379ad2276..753a9e20a7 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -8,7 +8,7 @@ min_height="350" min_width="240" name="places panel" - width="305"> + width="333"> <string name="landmarks_tab_title" value="Landmarks" /> @@ -24,7 +24,7 @@ left="15" name="Filter" top="3" - width="256" /> + width="300" /> <tab_container follows="all" height="326" @@ -33,7 +33,7 @@ name="Places Tabs" tab_position="top" top="30" - width="285" /> + width="313" /> <panel class="panel_place_info" filename="panel_place_info.xml" @@ -50,7 +50,7 @@ left="0" name="button_panel" top_pad="10" - width="305"> + width="313"> <button follows="bottom|left" font="SansSerifSmallBold" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 9aa2c304f2..cbe646f3cc 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -7,7 +7,7 @@ min_height="350" min_width="240" name="panel_target_profile" - width="305"> + width="333"> <string name="status_online"> Online diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 200c67b321..c5ebc8e1a3 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -8,6 +8,7 @@ > <sidetray_tab name="sidebar_home" + help_topic="sidebar_home" tab_title="Home" description="Home." image="BackArrow_Off" @@ -26,6 +27,7 @@ <sidetray_tab name="sidebar_people" + help_topic="sidebar_people" tab_title="People" description="Find your friends, contacts and people nearby." image="TabIcon_People_Off" @@ -35,6 +37,7 @@ > <panel_container name="panel_container" + width="333" > <panel class="panel_people" @@ -69,6 +72,7 @@ </sidetray_tab> <sidetray_tab name="sidebar_places" + help_topic="sidebar_places" tab_title="Places" label="Places" description="Find places to go and places you've been." @@ -87,6 +91,7 @@ <sidetray_tab name="sidebar_me" + help_topic="sidebar_me" tab_title="Me" description="Change your profile, your look and quick links to your outfits." image="TabIcon_Me_Off" @@ -105,6 +110,7 @@ <sidetray_tab name="sidebar_appearance" + help_topic="sidebar_appearance" tab_title="Appearance" description="Change your looks and appearance." image="TabIcon_Appearance_Off" diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index e87517e200..d379c60aed 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -7,7 +7,7 @@ label="home_tab" layout="topleft" name="home_tab" - width="300"> + width="333"> <panel background_visible="true" bg_alpha_color="DkGray2" @@ -17,7 +17,7 @@ layout="topleft" left="10" name="sidebar_people" - width="280"> + width="313"> <text follows="left|right|top" font="SansSerifBigBold" @@ -65,7 +65,7 @@ layout="topleft" left="10" name="sidebar_places" - width="280"> + width="313"> <text follows="left|right|top" font="SansSerifBigBold" @@ -113,7 +113,7 @@ layout="topleft" left="10" name="sidebar_me" - width="280"> + width="313"> <text follows="left|right|top" font="SansSerifBigBold" @@ -161,7 +161,7 @@ layout="topleft" left="10" name="sidebar_appearance" - width="280"> + width="313"> <text follows="left|right|top" font="SansSerifBigBold" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 530c3816c8..2eb9ba6d07 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -94,8 +94,9 @@ <string name="BUTTON_MINIMIZE">Minimize</string> <string name="BUTTON_TEAR_OFF">Tear Off</string> <string name="BUTTON_EDIT">Edit</string> - <string name="BUTTON_DOCK">Dock</string> - <string name="BUTTON_UNDOCK">Undock</string> + <string name="BUTTON_DOCK">Dock</string> + <string name="BUTTON_UNDOCK">Undock</string> + <string name="BUTTON_HELP">Show Help</string> <!-- searching - generic --> <string name="Searching">Searching...</string> |