Merge from default branch.

--HG--
branch : product-engine

2 files changed, 16 insertions, 1 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index ffdb59d44c..94686f0bb0 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -55,6 +55,7 @@
          label="Shape"
          layout="topleft"
          name="Shape"
+         help_topic="customize_shape_tab"
          width="400">
             <icon
              follows="top|right"
@@ -340,6 +341,7 @@ scratch and wear it.
          label="Skin"
          layout="topleft"
          name="Skin"
+         help_topic="customize_skin_tab"
          width="400">
             <icon
              follows="top|right"
@@ -591,6 +593,7 @@ scratch and wear it.
          label="Hair"
          layout="topleft"
          name="Hair"
+         help_topic="customize_hair_tab"
          width="400">
             <icon
              follows="top|right"
@@ -812,6 +815,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Eyes"
+         help_topic="customize_eyes_tab"
          top_delta="0"
          width="389">
             <icon
@@ -1010,6 +1014,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Shirt"
+         help_topic="customize_shirt_tab"
          top_delta="0"
          width="389">
             <icon
@@ -1215,6 +1220,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Pants"
+         help_topic="customize_pants_tab"
          top_delta="0"
          width="389">
             <icon
@@ -1420,6 +1426,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Shoes"
+         help_topic="customize_shoes_tab"
          top_delta="0"
          width="389">
             <icon
@@ -1625,6 +1632,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Socks"
+         help_topic="customize_socks_tab"
          top_delta="0"
          width="389">
             <icon
@@ -1830,6 +1838,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Jacket"
+         help_topic="customize_jacket_tab"
          top_delta="0"
          width="389">
             <icon
@@ -2047,6 +2056,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Gloves"
+         help_topic="customize_gloves_tab"
          top_delta="0"
          width="389">
             <icon
@@ -2252,6 +2262,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Undershirt"
+         help_topic="customize_undershirt_tab"
          top_delta="0"
          width="389">
             <icon
@@ -2457,6 +2468,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Underpants"
+         help_topic="customize_underpants_tab"
          top_delta="0"
          width="389">
             <icon
@@ -2662,6 +2674,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Skirt"
+         help_topic="customize_skirt_tab"
          top_delta="0"
          width="389">
             <icon
@@ -2867,6 +2880,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Alpha"
+         help_topic="customize_alpha_tab"
          top_delta="0"
          width="389">
             <icon
@@ -3154,6 +3168,7 @@ scratch and wear it.
          layout="topleft"
          left_delta="0"
          name="Tattoo"
+         help_topic="customize_tattoo_tab"
          top_delta="0"
          width="389">
             <icon
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7438a36ed0..a1f2548f81 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2085,7 +2085,7 @@ this texture in your inventory
 	<string name="ATTACH_BELLY">Belly</string>
 	<string name="ATTACH_RPEC">Right Pec</string>
 	<string name="ATTACH_LPEC">Left Pec</string>
-	<string name="ATTACH_HUD_CENTER_2"><HUD Center 2/string>
+	<string name="ATTACH_HUD_CENTER_2">HUD Center 2</string>
 	<string name="ATTACH_HUD_TOP_RIGHT">HUD Top Right</string>
 	<string name="ATTACH_HUD_TOP_CENTER">HUD Top Center</string>
 	<string name="ATTACH_HUD_TOP_LEFT">HUD Top Left</string>