From 5c09d482a47a8894ebebc9d3c8053b25a280f58e Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Fri, 15 Jan 2010 18:01:31 +0000
Subject: EXT-4148 EXT-4230: Lots of help ID updates.
Updated the logic of the help ID detection to search sub-panels before
searching active tabs. For some reason, certain tabs are still visible
and active even though they are not being displayed on screen. I also
removed a bunch of help IDs for button panels that just confuse things.
Also went through all of the side panel tabs and added new help IDs
where appropriate. These are:
profile_classified_info
profile_edit_classified
profile_pick_info
profile_edit_pick
my_inventory_tab
recent_inventory_tab
---
indra/newview/skins/default/xui/en/panel_classified_info.xml | 1 +
indra/newview/skins/default/xui/en/panel_edit_classified.xml | 1 +
indra/newview/skins/default/xui/en/panel_edit_pick.xml | 1 +
indra/newview/skins/default/xui/en/panel_main_inventory.xml | 2 ++
indra/newview/skins/default/xui/en/panel_pick_info.xml | 1 +
indra/newview/skins/default/xui/en/panel_picks.xml | 1 -
indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 1 -
indra/newview/skins/default/xui/en/sidepanel_item_info.xml | 3 +--
indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 3 +--
9 files changed, 8 insertions(+), 6 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 5c594d3f14..677bdbc3d2 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -7,6 +7,7 @@
left="0"
min_height="350"
name="panel_classified_info"
+ help_topic="profile_classified_info"
top="0"
width="333">
<panel.string
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index 1fbf7abda9..188ded3dab 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -9,6 +9,7 @@
left="0"
min_height="350"
name="panel_edit_classified"
+ help_topic="profile_edit_classified"
top="0"
width="333">
<panel.string
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 7769189219..15eff4b67c 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -9,6 +9,7 @@
left="0"
min_height="350"
name="panel_edit_pick"
+ help_topic="profile_edit_pick"
top="0"
width="333">
<button
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 9d00abd2c9..4030c7184a 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -41,6 +41,7 @@ halign="center"
follows="all"
height="295"
label="MY INVENTORY"
+ help_topic="my_inventory_tab"
layout="topleft"
left="0"
name="All Items"
@@ -51,6 +52,7 @@ halign="center"
follows="all"
height="295"
label="RECENT"
+ help_topic="recent_inventory_tab"
layout="topleft"
left_delta="0"
name="Recent Items"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 9c7f38e688..822e049eec 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -7,6 +7,7 @@
left="0"
min_height="350"
name="panel_pick_info"
+ help_topic="profile_pick_info"
top="0"
width="333">
<button
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 1fc553ff36..a2b0adf9d9 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -124,7 +124,6 @@
height="25"
top_pad="10"
name="buttons_cucks"
- help_topic="picks_button_tab"
width="313">
<button
enabled="false"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 51974be854..fb5f9d2ec8 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -33,7 +33,6 @@
<panel
height="25"
layout="bottomright"
- help_topic="item_button_tab"
name="button_panel"
left="5"
bottom="5"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 4a992dadd9..e18f59ab64 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -401,7 +401,6 @@ top_pad="10"
<panel
height="30"
layout="bottomright"
- help_topic="button_tab"
name="button_panel"
left="5"
bottom="2"
@@ -414,4 +413,4 @@ top_pad="10"
right="-1"
width="100" />
</panel>
- </panel>
\ No newline at end of file
+ </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 2dfcdf4a4c..74f97dca4e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -518,7 +518,6 @@
<panel
height="25"
layout="bottomright"
- help_topic="button_tab"
name="button_panel"
left="5"
bottom="5"
@@ -551,4 +550,4 @@
top="0"
width="100" />
</panel>
-</panel>
\ No newline at end of file
+</panel>
--
cgit v1.2.3