From 5ec6c146bda268d4fdbf162a1826aa5fbea3d5a1 Mon Sep 17 00:00:00 2001
From: Cinders <cinder@cinderblocks.biz>
Date: Sun, 16 Dec 2012 10:54:14 -0700
Subject: [PATCH] Add tooltips, remove (non-functional) help alert modal
 buttons for OpenRegion settings panel

---
 indra/newview/llfloaterregioninfo.cpp         | 10 --
 .../en/panel_region_open_region_settings.xml  | 93 ++++---------------
 2 files changed, 20 insertions(+), 83 deletions(-)

diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index c51010efb9..aa6c647782 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -967,16 +967,6 @@ BOOL LLPanelRegionOpenSettingsInfo::postBuild()
 	initCtrl("allow_parcel_windlight");
 	initCtrl("terrain_detail_scale");
 
-	childSetAction("force_draw_distance_help", onClickHelp, new std::string("HelpForceDrawDistance"));
-	childSetAction("max_inventory_items_transfer_help", onClickHelp, new std::string("HelpMaxInventoryItemsTransfer"));
-	childSetAction("max_groups_help", onClickHelp, new std::string("HelpMaxGroups"));
-	childSetAction("render_water_help", onClickHelp, new std::string("HelpRenderWater"));
-	childSetAction("allow_minimap_help", onClickHelp, new std::string("HelpAllowMinimap"));
-	childSetAction("allow_physical_prims_help", onClickHelp, new std::string("HelpAllowPhysicalPrims"));
-	childSetAction("enable_teen_mode_help", onClickHelp, new std::string("HelpEnableTeenMode"));
-	childSetAction("show_tags_help", onClickHelp, new std::string("HelpShowTags"));
-	childSetAction("allow_parcel_windlight_help", onClickHelp, new std::string("HelpAllowParcelWindLight"));
-
 	childSetAction("apply_ors_btn", onClickOrs, this);
 
 	refreshFromRegion(gAgent.getRegion());
diff --git a/indra/newview/skins/default/xui/en/panel_region_open_region_settings.xml b/indra/newview/skins/default/xui/en/panel_region_open_region_settings.xml
index bd6a8612cf..c8c41273b5 100644
--- a/indra/newview/skins/default/xui/en/panel_region_open_region_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_open_region_settings.xml
@@ -18,6 +18,7 @@
 	 max_val="10000"
 	 min_val="-1"
 	 name="draw_distance"
+	 tool_tip="Sets the default regional draw distance"
 	 top="10"
 	 width="250"/>
 	<check_box
@@ -26,17 +27,9 @@
 	 label="Force Draw Distance"
 	 left="10"
 	 name="force_draw_distance"
+	 tool_tip="If this box is checked, draw distance will be locked for all people in the region. Note: This will lag people on older machines. (Default: Off)"
 	 top_delta="22"
 	 width="80"/>
-	<button
-	 top_delta="0"
-	 follows="left|top"
-	 font="SansSerifSmall"
-	 height="18"
-	 label="?"
-	 left="285"
-	 name="force_draw_distance_help"
-	 width="18"/>
 	<spinner
 	 follows="left|top"
 	 height="20"
@@ -47,6 +40,7 @@
 	 max_val="10000"
 	 min_val="0"
 	 name="max_drag_distance"
+	 tool_tip="Sets the maximum distance a prim can be dragged in this region"
 	 top_delta="22"
 	 width="250"/>
 	<spinner
@@ -59,6 +53,7 @@
 	 max_val="10000"
 	 min_val="0"
 	 name="max_prim_scale"
+	 tool_tip="Sets the maximum size a prim can be made in this region"
 	 top_delta="22"
 	 width="250"/>
 	<spinner
@@ -71,6 +66,7 @@
 	 max_val="10000"
 	 min_val="0"
 	 name="min_prim_scale"
+	 tool_tip="Sets the minumum size a prim can be made in this region"
 	 top_delta="22"
 	 width="250"/>
 	<spinner
@@ -83,6 +79,7 @@
 	 max_val="10000"
 	 min_val="0"
 	 name="max_phys_prim_scale"
+	 tool_tip="Sets the maximum size a physical prim can be made in this region"
 	 top_delta="22"
 	 width="250"/>
 	<spinner
@@ -95,6 +92,7 @@
 	 max_val="100"
 	 min_val="0"
 	 name="max_hollow_size"
+ 	 tool_tip="Sets the maximum size a hole can be made in a prim created in this region"
 	 top_delta="22"
 	 width="250"/>
 	<spinner
@@ -107,6 +105,7 @@
 	 max_val="100"
 	 min_val="0"
 	 name="min_hole_size"
+	 tool_tip="Sets the minimum size a hole can be made in a prim created in this region"
 	 top_delta="22"
 	 width="250"/>
 	<spinner
@@ -119,6 +118,7 @@
 	 max_val="100000"
 	 min_val="0"
 	 name="max_link_count"
+	 tool_tip="Sets the maximum amount of objects that can be linked in a non-physical linkset for the region"
 	 top_delta="22"
 	 width="250"/>
 	<spinner
@@ -131,6 +131,7 @@
 	 max_val="100000"
 	 min_val="0"
 	 name="max_link_count_phys"
+	 tool_tip="Sets the maximum amount of objects that can be linked in a physical linkset for the region"
 	 top_delta="22"
 	 width="250"/>
 	<spinner
@@ -143,6 +144,7 @@
 	 max_val="10000"
 	 min_val="-1"
 	 name="max_inventory_items_transfer"
+	 tool_tip="This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. (Default: -1)"
 	 top_delta="22"
 	 width="250"/>
 	<spinner
@@ -155,17 +157,9 @@
 	 max_val="10000"
 	 min_val="-1"
 	 name="terrain_detail_scale"
+	 tool_tip="Sets the region's terrain detail scale"
 	 top_delta="22"
 	 width="250"/>
-	<button
-	 follows="left|top"
-	 font="SansSerifSmall"
-	 height="18"
-	 label="?"
-	 left="285"
-	 name="max_inventory_items_transfer_help"
-	 top_delta="0"
-	 width="18"/>
 	<spinner
 	 follows="left|top"
 	 height="20"
@@ -176,17 +170,9 @@
 	 max_val="2"
 	 min_val="0"
 	 name="show_tags"
+	 tool_tip="This box controls how avatar name tags are shown in this sim. 2 sets tags to always be shown. 1 sets tags to disappear after some time. 0 blocks the viewing of name tags."
 	 top_delta="22"
 	 width="250"/>
-	<button
-	 follows="left|top"
-	 font="SansSerifSmall"
-	 height="18"
-	 label="?"
-	 left="285"
-	 name="show_tags_help"
-	 top_delta="0"
-	 width="18"/>
 	<spinner
 	 follows="left|top"
 	 height="20"
@@ -197,74 +183,43 @@
 	 max_val="1000"
 	 min_val="-1"
 	 name="max_groups"
+	 tool_tip="This box controls how many groups an agent can join. -1 sets no limit on the amount of groups. (Default: -1)"
 	 top_delta="22"
 	 width="250"/>
-	<button
-	 follows="left|top"
-	 font="SansSerifSmall"
-	 height="18"
-	 label="?"
-	 left="285"
-	 name="max_groups_help"
-	 top_delta="0"
-	 width="18"/>
 	<check_box
 	 follows="left|top"
 	 height="20"
 	 label="Render Water"
 	 left="10"
 	 name="render_water"
+	 tool_tip="If this box is checked, water will not be shown for users in the region. (Default: Off)"
 	 top_delta="20"
 	 width="250"/>
-	<button
-	 follows="left|top"
-	 font="SansSerifSmall"
-	 height="18"
-	 label="?"
-	 left="285"
-	 name="render_water_help"
-	 top_delta="0"
-	 width="18"/>
 	<check_box
 	 follows="left|top"
 	 height="20"
 	 label="Allow Minimap"
 	 left="10"
 	 name="allow_minimap"
+	 tool_tip="If this box is checked, the minimap will be disabled for users in the region. (Default: Off)"
 	 top_delta="18"
 	 width="250"/>
-	<button
-	 follows="left|top"
-	 font="SansSerifSmall"
-	 height="18"
-	 label="?"
-	 left="285"
-	 name="allow_minimap_help"
-	 top_delta="0"
-	 width="18"/>
 	<check_box
 	 follows="left|top"
 	 height="20"
 	 label="Allow Physical Prims"
 	 left="10"
 	 name="allow_physical_prims"
+	 tool_tip="If this box is checked, physical prims may not be created in the region. (Default: On)"
 	 top_delta="18"
 	 width="250"/>
-	<button
-	 follows="left|top"
-	 font="SansSerifSmall"
-	 height="18"
-	 label="?"
-	 left="285"
-	 name="allow_physical_prims_help"
-	 top_delta="0"
-	 width="18"/>
 	<check_box
 	 follows="left|top"
 	 height="20"
 	 label="Enforce Max Build Constraints"
 	 left="10"
 	 name="enforce_max_build"
+	 tool_tip="If this box is checked, the region will enforce maximum build constraints. (Default: On)"
 	 top_delta="18"
 	 width="250"/>
 	<check_box
@@ -273,23 +228,15 @@
 	 label="Allow Parcel WindLight"
 	 left="10"
 	 name="allow_parcel_windlight"
+	 tool_tip="If this box is checked, setting WindLight settings in parcels will be enabled. (Default: On)"
 	 top_delta="18"
 	 width="250"/>
-	<button
-	 follows="left|top"
-	 font="SansSerifSmall"
-	 height="18"
-	 label="?"
-	 left="285"
-	 name="allow_parcel_windlight_help"
-	 top_delta="0"
-	 width="18"/>
 	<button
 	 enabled="false"
 	 follows="left|top"
 	 height="20"
 	 label="Apply"
-	 left="108"
+	 left="10"
 	 name="apply_ors_btn"
 	 top_delta="20"
 	 width="100"/>