diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
index 5dd0852a7255ce0ce036d6e73ed7b0ad0427975d..2292b79eda6a0d3f428a24fc36f468bab7a02277 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png and b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png
index 350a62c0aef006d7898535cd2884cf70db3420c6..1a514742d3bf0de014ed58a3e691ebfc2e9659a1 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png and b/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Press.png b/indra/newview/skins/default/textures/windows/Icon_Help_Press.png
index c2d401b1315cbe1f23a68c07470623492fdb669f..7478644b6a87bdd90bb58b395aeaafa74b329233 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Help_Press.png and b/indra/newview/skins/default/textures/windows/Icon_Help_Press.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png
index a164edb62d4e0b6e8bb3b90db9daab242fb8c8ad..9f72a5422b3b7bf25c1fd1fc118fc717a6a4425f 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png and b/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png
index 990e03e2b2419607794dfe02ae394c91053ef19a..07db8be1b08e34fb5c41145edaf7edde6103a00a 100644
Binary files a/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png and b/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index bf8988ca4577696a11c0d5dfffa0ca3546acf43c..6d64d13db7ee991751886436a12a5a74f02a5856 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 9e5ac1d2014995f6f2d7aeee66e9e9087bcab737..bfa979ab6f9ae3a6082327f1a68050fce18a8b01 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 63abb63bdf3057edbeb4f539a5d9352d69e31372..f11391c5e000fb9880ace0955a3f7c01a6d58a04 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 0af4e1db541a04f5fe10932f43edf4a86e051e01..f81250e7b9936bcf3b6958d40cb81849c5a43203 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 57412ae209bff6bab295df44858b16c2a42c26f5..3a2337bfff34e73cdca3567c95ce3a57eef48b10 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 32d3f4fd7e6ee44cc5ce95ca9d942ee17d305cdb..29f8b49794325a7a16056baada786ac9b6c1f736 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 b36e18093e944c29229a6d2a08593dec6fdb8345..3ab5c1830003bf346eca974694396920c09d843d 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 9e2c8a44d1693ee340900e5a54cf769db8469544..f6b965f139512a84836bcaa9d30c52a4c68cc1c2 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 ea4128976993c8681e9ff6c7ead60079e7b9453f..afbbeb48338791587c25cf946580bf5f77d4a069 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 f96aea3d901bb7f8ba772b56f51d287c2df0f6c6..a65a159bd5cb24e6181c03bddb73a2289ef13bd3 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 6cb90f5c05fa18e9b3603b19d0cdc1372c9612f9..897e5da4e8e91655d7478ffc7c04bf3c737da42d 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 4fb2fe24cc9f4cf2a12ad5cd1a30255ab3b08812..d1f67068759824e774732faac9ac886d62aa9fa6 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 0930043659b95b8854f51e8ab1ea1ccf917c8da5..8d27ae894baa969323200ba47a98178fc95bd21c 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 e2bdc756a9181d948ef364350f2961a2d5236c53..52c7944ba9f85762acfa119126d4517cdc41e183 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 5e0e4231286fcbbf400db3cc3cb4af1baa5caeca..bd0dac5ca186745f2158e56562ccd8ffc492caa3 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 505411b96402ff04d1dbceb4cf2d1d2391ac3a7f..0b4684e8ba56a268037fb0e60074a9c1231567ab 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 ac00ee7a76816a0fc3e9552a257a17aa1cbeb873..4a8830ed5a2bea3534715bc7b35000ae16c8f851 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 428afcff52d25ec439d9c4f276fd864bbd7cb766..371e239fdb3131a0cb2935ebec8a1042ceff6562 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 cda2020fcada0d2c13a1f120456e4f7a5cd26de8..f2146339a7799383550460bfe31b550d9c53bd5a 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 5475a1cf6a56d712b9c235e24496a1da873a2ed1..7d1a1113b0bc9d76d1b6a1b3c2528d4d0a263d44 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 4463d440498c73abc9f80084ffed5dc1803e123c..3b6d5452e34b6661d73e5a4cdc74c3884b909d21 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 9ca7172f81f0b0eab6e60c3bb41c20593be60c7e..b044cd41e644bec6ffd2072ca0ebf8a1efd920e7 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 fa0cce3795a9bfc55c40a8ab8902cab7d61a1567..8901608374326938da2c86a7b668bd2e67295cd3 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 5aa78092089c0c93da84be204ccfb33cd339c76a..5e87e065a4a730cc1298777bf7da3a66c854d5ea 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 c16373ba3cb0cbf25c70786973862cfa2b3c7a86..49751111116da07407f62cdf7f80a1619e688e9d 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 744d43498265f2290eb0083d051ef1edf8f4e40e..6f9038df626c6cbc5b95b24002a516031b21105f 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 f042385fb4659944a4d7b718a34d89f8faabe7a1..052398bcd32bdd3d1029d95b59f3b7423fc32194 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 e3bea2e2d6457e06e826487c64135b226ddc4764..615c35e6c3473baeaf3082224953716cae2ff2fa 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 b7733c638844078b755c14f9508f8cf9b044d39e..70f296b606bea6f7e708928e17331b666c8827d9 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 0000000000000000000000000000000000000000..a1265d49f9747c657fa48736c226e7829d7357a1
--- /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 73804f90a584be2c0abbf407a51a63304163fd4f..23e0ef50fdd081b642d62d86ba39164ba743d27b 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 e8b8fee67867e0dd1a26d3ddbce29e1254daa495..b6cf05aefcee636379de9d58b38d2e8e2fa38e16 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 ae9e658688cd070625b5d77c7913672beb20897a..a5d76821a820b340780fd35657a6a52b27ce9967 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 6fface12a39c3cd392ce321fd73ee72eb5a7f51a..4e4fe97e6276a8f4b8b67e40a4c61c3e6a896695 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 2e7f5e6c42388cb8c1627efa01eba8b802016612..8b271eb41ef6e8d1d6870cd0874b3a019edc1e88 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 b43cdca0d10a680b704a099a555688beda47951f..00b9f850adf367820d6dd6683bd9c0f91ffc9749 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 e94ca1b30b6fc9425a94730793df9737f7c48d0a..4826941b5857b2002064311733758dfa3169271a 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 10bcee7c85022de30734edbc3543a570631008f3..2882f233c28f051a65958a402d789386bdc48404 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 f3d0f37c01a4eac7fad9bbf7756533720928824d..6556a147308db59af65b4dddb2f393f5047b808e 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 b9c1b08c68b27bbb793ede9a833113eb46d9ecd2..c0bcfd2271c7962cac676511b742290422d4c375 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 a326cd006fee2f276dc92a3525c110f1a4339bc2..3f5127561a490ac4b84ec9650222124d2044defa 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 60677ca0dfb6b2231164632ee753c09933dfbed5..f887b48ed0e24ee1adbcfbc1dc72dc25639e8fd2 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 6d6c6c6644dd93e222f6b9c7978c58886e69fd2e..fac8fdbefacc6299088b9f7d7d481e9357d6e5f2 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 ce6b0efd03e107d0e0577bb19c3e2932fc54e61b..fd2ee6ce5cab9c8b8e4385bfed3b3aa9220fd2b4 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 ed3b00250b1567c53758ccbe41ef9798fa09a308..70f9c196581d83ac80e9143409929967edabfff5 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 28b8139bfdb75a1e50ab86a98cbc7bbb6ac8aabe..ad2c50c6d9ab1fb75037bf5008efa05d11250a23 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 da698f276b4f271403fc514a4827678f02ccd5b1..3ce41f5ec336efc88ab4337fc4e5624935644634 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 829dd2132f00612bf4a8a0959c8e2e87b8156aa4..b7006cf248a4dafc20be7cc4b491fe50a684e7e8 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 6b6b2c80ba82a92d8471947814311ef1c2be2e0e..412df1d2626e78f75045e3ff0c7661edad62b2d9 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 65665c7036d1fc4d0210570c55bc54e13f4c0437..a9a18f44c4d4e1193c9f4ca002a13c4f2573344f 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 674bfa42dad539213abf30b25526e509292a2797..78f795b0e2bb86dc813197201161a5f33f78c716 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 34bda53ef124cbaa3d1657d2403af50caefe7cc0..3783417cdb646c27ff349d45b80c06fac18a6506 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 e0ac2c1d5161dbce8ebfec9c0daf5d703ae65e05..ef6124b3adcdd3fc3ccbecd425deae8f2f7d7a10 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 96195c9ba1ebc2df9132c5ef10aac30f9926f334..ac5e4592b70c758e01f7755f88d82f0a25ca5f91 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 bb91f709a34220805eb5a2d746b026dc1725d2cd..88dae0d20be602c7161208f60845a23bd34b12d8 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 e4cb97035c0d7e1455b678531d8338dc77c5d101..f65bb6f32f876c5c6dcaaed3afc454594f93358c 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 5a36ed5fd6c0b4b7378b057978728f7bd5126f99..aaf7aecd6bb93e12b3bb0a92b05084da7724cf2d 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 8657663057e2a6b2ca1dd2ba043b3c9ddc9ee46e..d93cad6dbd04e34970a4fc2585269232e7157de9 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 bacec627e1b84f9ca68e0c12cc108346e7c9336e..d655c268b202e695a8407693d23b3b19d6e9e301 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 e9342b772f6fc6c4195796db92d67a9e239570e3..5756f9590eb9b98a66f96d84c76d8cfe399d0da0 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 6fac2823e844abfc59d9a89e066d23db4d29f6f5..07167c3ae449d7bcd2629458b4bb7faf7fe3694e 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 58dd43075d324ae334c680ad77b6cb35afa801fd..77fbe7c060ef3f1d169498b4c82838e0ea06112a 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 c196bbe8521b2be1ae00a4ef682a1bc617026e40..a523f40bb821b1af80cf0dbc665f8ae00833c59e 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 b20a6fe868cce76d023d24a8ba753808f04d6e73..43e4f8a3489d1a1b95d80e43aa6963c952c36bd7 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 17b6766f67e59dc5b4f29c07cc349c5d36e0e341..606ae1a82a0ef20ba2e675669a17b503d5635821 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 a8f7e95aede18f4ce34f6932ed13c061eebf8eb1..4b4f611b598f4cf464d457645dfdbe99c784d8dd 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 3e2045e1f7b718ca7df174e66ccff8fb5deb36fd..1d7b7adca2a597b6caf14a953502d460c9cfff22 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 e341dd7b975adae13b5f08a175c4694ca92b35a0..4220655a6fcd9a237a9b001b2ef7ddb65a199317 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 7bac6fdb32d6e30bae8a6a5440c198d3ee53049e..a243cb399eef0795cdbbbac61a9950a5025b98e8 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 a890de3e282c04fe7bd9ab8ef33e4950efe7d1b3..e045b811f2ce99a922c6f7a09c70efaec26f1e4e 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 48fa8a14c67d1cadf9114dcf9439c28f5b2c5408..c7f5a1170f159a4fbf4859829a181b8cf776b520 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 2ae0afa1681bde6063e6a168e4ade9317d3b5a93..53d4925214266a50e122f1b5eed6b3356b12aae8 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 2dd7a1e777c7ee1a5618bfeaf292eb9d81f36de8..c8b8c34f85bb1dba513bcb7c5ab850c19b911b87 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 ef6847846045eed9571a1970e3ad3800336fb774..54ab30124a0a59c2665301bfca429043083eae18 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 ad91e8156b89ea4815a297c8bd36655f487704b9..467dcfae20a08ea065c22aa008194b5b00aff141 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 bb0c60e75b93325e6c95d8c25658ef1a3e157d63..545abc39a25385547872a8fd48ef0168efc07ccb 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 b89af0ef3e68bc0a0f50e90b73b2d28dcef92f5e..8e1317440e7c06cb365ddf1730642ea1d1309899 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 5075bc770a342e72b4f44b48b44fc8a933219f8d..f07b9d37678b229fc7df7c8682eb018a91b5754b 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 4d4dc084bffa6fc939eec24a2848120ededed52f..e2f4a73ec8418c1d4b61785f9a53a655b0c23a44 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 1d2978adb87013fb6eb65978602967a0f35b2377..bd1484c0fec68f052f8c9bba806b09b5d22e53f7 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 78540c0b986943994216e3c7db4bda83692c9eb0..3b1eae9293568a78ffffb95cb875a66f2761562a 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 1661fbffb0ffa1d333f996f48a276ef615c8402c..653bc942e59023361c5c1241c393eaca7697e4f7 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 4d7da97f7989f3f237e2aaff558275a5350e64ed..205e6efe700ae48c176a1c7e8ac7d4afd4e8eeab 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 76b2e5c81117d175125b40e8b1ef845e42457ef1..3f31641cac164922c65e237bb059e8663b826e6c 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 ef9aef7f6f7038ca1156b93852cc16d7962a8435..b703b49b8b8763009bb9b2b4fd9f18deea76d62a 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 81247a387c07bf905fdb6ed39805053fe6ebea4e..ce17873a6763c1e24aab59bfed1ca958d557901d 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 bedbc9d563f11b740ee3fef90e56a2ef2c2a6a23..66a5b9267dfabe11aacbf265a79d34b942873861 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 06422d6a26b01300c8a5c252db82421f0654770e..956d5669b8c3b6813cab275492ea3996dac56d0a 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 b23bf49435c1456a16a532a969d9a34629139d37..a1a271d0eb74f97f938c2c5fafbd1b165d7e7000 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 344ad8447e7dbc9eaa745337c27971232dda0953..209859bb298a8da4d6ef9e07418c82715e09b376 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 a17e3ea9495c518974645cf59a2d9b5833927e99..251ca4c9bf5894ef4bdcc2b2f419a58640b234d8 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 b63769922806145a94821f42c47f873c8928cf8f..98d6d5bda773b14a8736cec8ecc0420ba8c82b4d 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 21956c2eac940ad09e6cc7e0bb056edb7ecfc1f5..dd551b6d5146456ee4fde662e94e6b830dbe0f97 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 ef3e1f598dac15ac193d5cb825bf026912be1140..35190c0e1abd6bcd9a71d6fc6d23f1e76704eda8 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 b1d468e2659301874855c508285fc17c3f6d8fb3..3545f88df7fd3d27938284521cae07435b1d6972 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 752ed81f65cd4ae997e03bf3b33e96a421cd3366..c4e5bc9e99d79972efb6c3e3ad9d75584e918e84 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 b4f3fc1e784c4e940a0ba821589e72efbed857eb..88c001b71447a44b91f86556fc88527293fbf1ea 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 d773e1f2b819c1a54730cd1b62231a2f58a6b700..6ddaa63c1d2150503ce110b6d4f96c3a6a38a710 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 dc048eb352cf7b2493e2781294554dbb818fa082..f2b701b88d33ad76ee4e5c3e82e35888a412e9d5 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 e373da300c50b339e95a8c1ed740f8bba8b2086a..327dc07cbe9810bfb3fa1c3802a3d544109f7c86 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 ecd64d08e69254a6341e734c88a7517d1f1fc24c..07ffc204f97856e725ee6d13c52c13c4d297bc8a 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 54facbb659153afa7a19f4d172496feecad9cdba..b290a9c87d50f126fded2423a6f4aa0de84fd9e6 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 bbb17dfb8fb1cf125c97dcb2994416641106ae26..2c14b3d87a3c52c570b47870a56a51e47f6991f8 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 cf59d44d016514f4f464ebbaf4a872c219c3415d..6c1fb65bddd46255cb8fa215ed0f559a7dc71ad8 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 07ebf734ea2feb5c0a644e80947c237d2e8afd1c..febfd1929e9ef3de12898342680f45b69201c8e4 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 ee67989d332d3d3eac34373aaa2142ceb5876d76..e698dfe2dcde225203587a069390503aac2668b9 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 5257cc687e0987348084814f7dab363611ccf522..872bd704d5419e805ba0d29a03158971d0993065 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 e46588dd711c3a18a43786465e1c027a377c9431..bd76b103129232778ea40ab48200039c43a0ed49 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 f908e9d610b7f2a9d51f175135c56ed378c60a35..643a1d06e69a5a4895d2640ef4832a72a43358f2 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 9306f83ddedb2e48013cd3ad951ec23042340d40..ee15e6f29cae1e4606f80e6b5d3d78473f8d68a1 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2554,14 +2554,6 @@
<menu_item_call.on_click
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"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9a012bcfa9c1015d32c7d5a2869941d700806cbf..80d501b63ecf1722859d75809ad50d216f0389a9 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 b379ad22761ca331d4467bebd56cb3ef6c2587f4..753a9e20a7fb3bb976218600291f04c5addba8b3 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 9aa2c304f24840376b2a549fa3ea67689ddbcd99..cbe646f3cca774e7b3c2a3bb6c9d832d342a4151 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 200c67b321cafe76128adba30e8229e0c5d3b425..c5ebc8e1a3541e0fe3235a74f4a204041a45dfdb 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 e87517e200ac8684173d13d213defea337960d16..d379c60aeda23a486333ff5e5bc63cad16d12cec 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 530c3816c8338ad20e8dcf9c241c7492e2ce675a..2eb9ba6d070be82672d4cfee4557c1128e4dec8e 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>