From dedb5be906b53d1ea8601ff6b9c4b726fda02da8 Mon Sep 17 00:00:00 2001
From: Ramzi Ramey <ramzi@lindenlab.com>
Date: Fri, 17 Jul 2009 23:06:53 +0000
Subject: DEV-35770 I18N: all <combo_box.item> are missing a name= parameter. I
 put them back, using the original name= given in version 1.23, but in some
 cases I just renamed long lists with "item1", "item2", etc.

---
 .../skins/default/xui/en/floater_about_land.xml    | 30 ++++++++
 .../default/xui/en/floater_animation_preview.xml   | 85 ++++++++++++++++------
 .../skins/default/xui/en/floater_buy_land.xml      |  9 ++-
 .../skins/default/xui/en/floater_god_tools.xml     |  6 ++
 .../default/xui/en/floater_hardware_settings.xml   |  5 ++
 .../skins/default/xui/en/floater_image_preview.xml | 30 +++++---
 .../skins/default/xui/en/floater_report_abuse.xml  | 39 ++++++++++
 .../skins/default/xui/en/floater_sell_land.xml     |  5 +-
 .../default/xui/en/floater_settings_debug.xml      |  2 +
 .../skins/default/xui/en/floater_snapshot.xml      | 30 +++++++-
 .../skins/default/xui/en/floater_test_combobox.xml | 12 +++
 .../skins/default/xui/en/floater_test_widgets.xml  |  2 +
 .../newview/skins/default/xui/en/floater_tools.xml | 60 ++++++++++++++-
 .../skins/default/xui/en/floater_ui_preview.xml    |  2 +
 .../skins/default/xui/en/floater_world_map.xml     |  2 +
 .../skins/default/xui/en/panel_classified.xml      |  5 +-
 .../skins/default/xui/en/panel_group_general.xml   |  5 +-
 indra/newview/skins/default/xui/en/panel_login.xml |  3 +
 .../default/xui/en/panel_preferences_advanced.xml  |  4 +
 .../default/xui/en/panel_preferences_general.xml   | 25 ++++++-
 .../default/xui/en/panel_preferences_graphics1.xml |  4 +
 .../newview/skins/default/xui/en/panel_profile.xml |  3 +
 .../skins/default/xui/en/panel_region_general.xml  |  3 +
 23 files changed, 326 insertions(+), 45 deletions(-)

(limited to 'indra')

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 3563780f8b..0a4aa12faa 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1383,42 +1383,55 @@ Only large parcels can be listed in search.
              width="130">
                 <combo_box.item
                  label="Any Category"
+                 name="item0"
                  value="any" />
                 <combo_box.item
                  label="Linden Location"
+                 name="item1"
                  value="linden" />
                 <combo_box.item
                  label="Adult"
+                 name="item2"
                  value="adult" />
                 <combo_box.item
                  label="Arts &amp; Culture"
+                 name="item3"
                  value="arts" />
                 <combo_box.item
                  label="Business"
+                 name="item4"
                  value="store" />
                 <combo_box.item
                  label="Educational"
+                 name="item5"
                  value="educational" />
                 <combo_box.item
                  label="Gaming"
+                 name="item6"
                  value="game" />
                 <combo_box.item
                  label="Hangout"
+                 name="item7"
                  value="gather" />
                 <combo_box.item
                  label="Newcomer Friendly"
+                 name="item8"
                  value="newcomer" />
                 <combo_box.item
                  label="Parks &amp; Nature"
+                 name="item9"
                  value="park" />
                 <combo_box.item
                  label="Residential"
+                 name="item10"
                  value="home" />
                 <combo_box.item
                  label="Shopping"
+                 name="item11"
                  value="shopping" />
                 <combo_box.item
                  label="Other"
+                 name="item12"
                  value="other" />
             </combo_box>
             <combo_box
@@ -1432,39 +1445,51 @@ Only large parcels can be listed in search.
              width="130">
                 <combo_box.item
                  label="Any Category"
+                 name="item0"
                  value="any" />
                 <combo_box.item
                  label="Linden Location"
+                 name="item1"
                  value="linden" />
                 <combo_box.item
                  label="Arts &amp; Culture"
+                 name="item3"
                  value="arts" />
                 <combo_box.item
                  label="Business"
+                 name="item4"
                  value="store" />
                 <combo_box.item
                  label="Educational"
+                 name="item5"
                  value="educational" />
                 <combo_box.item
                  label="Gaming"
+                 name="item6"
                  value="game" />
                 <combo_box.item
                  label="Hangout"
+                 name="item7"
                  value="gather" />
                 <combo_box.item
                  label="Newcomer Friendly"
+                 name="item8"
                  value="newcomer" />
                 <combo_box.item
                  label="Parks &amp; Nature"
+                 name="item9"
                  value="park" />
                 <combo_box.item
                  label="Residential"
+                 name="item10"
                  value="home" />
                 <combo_box.item
                  label="Shopping"
+                 name="item11"
                  value="shopping" />
                 <combo_box.item
                  label="Other"
+                 name="item12"
                  value="other" />
             </combo_box>
             <button
@@ -1566,14 +1591,17 @@ Only large parcels can be listed in search.
                 <combo_box.item
                  enabled="true"
                  label="Blocked"
+                 name="Blocked"
                  value="Blocked" />
                 <combo_box.item
                  enabled="true"
                  label="Landing Point"
+                 name="LandingPoint"
                  value="Landing Point" />
                 <combo_box.item
                  enabled="true"
                  label="Anywhere"
+                 name="Anywhere"
                  value="Anywhere" />
             </combo_box>
         </panel>
@@ -2004,9 +2032,11 @@ Options:
              width="100">
                 <combo_box.item
                  label="Anyone"
+                 name="Anyone"
                  value="anyone" />
                 <combo_box.item
                  label="Group"
+                 name="Group"
                  value="group" />
             </combo_box>
             <spinner
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 2f585d5974..846dda802d 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -252,42 +252,55 @@ Maximum animation length is [MAX_LENGTH] seconds.
      width="104">
         <combo_box.item
          label="Spread"
+         name="Spread"
          value="" />
         <combo_box.item
          label="Relaxed"
+         name="Relaxed"
          value="Hands_Relaxed" />
         <combo_box.item
          label="Point Both"
+         name="PointBoth"
          value="Hands_Point" />
         <combo_box.item
          label="Fist"
+         name="Fist"
          value="Hands_Fist" />
         <combo_box.item
          label="Relaxed Left"
+         name="RelaxedLeft"
          value="Hands_Relaxed_L" />
         <combo_box.item
          label="Point Left"
+         name="PointLeft"
          value="Hands_Point_L" />
         <combo_box.item
          label="Fist Left"
+         name="FistLeft"
          value="Hands_Fist_L" />
         <combo_box.item
          label="Relaxed Right"
+         name="RelaxedRight"
          value="Hands_Relaxed_R" />
         <combo_box.item
          label="Point Right"
+         name="PointRight"
          value="Hands_Point_R" />
         <combo_box.item
          label="Fist Right"
+         name="FistRight"
          value="Hands_Fist_R" />
         <combo_box.item
          label="Salute Right"
+         name="SaluteRight"
          value="Hands_Salute_R" />
         <combo_box.item
          label="Typing"
+         name="Typing"
          value="Hands_Typing" />
         <combo_box.item
          label="Peace Right"
+         name="PeaceRight"
          value="Hands_Peace_R" />
     </combo_box>
     <text
@@ -310,45 +323,65 @@ Maximum animation length is [MAX_LENGTH] seconds.
      top_delta="-1"
      width="104">
         <combo_box.item
-         label="None]" />
+         label="(None)"
+         name="[None]" />
         <combo_box.item
-         label="Aaaaah" />
+         label="Aaaaah"
+         name="Aaaaah" />
         <combo_box.item
-         label="Afraid" />
+         label="Afraid"
+         name="Afraid" />
         <combo_box.item
-         label="Angry" />
+         label="Angry"
+         name="Angry" />
         <combo_box.item
-         label="Big Smile" />
+         label="Big Smile"
+         name="BigSmile" />
         <combo_box.item
-         label="Bored" />
+         label="Bored"
+         name="Bored" />
         <combo_box.item
-         label="Cry" />
+         label="Cry"
+         name="Cry" />
         <combo_box.item
-         label="Disdain" />
+         label="Disdain"
+         name="Disdain" />
         <combo_box.item
-         label="Embarrassed" />
+         label="Embarrassed"
+         name="Embarrassed" />
         <combo_box.item
-         label="Frown" />
+         label="Frown"
+         name="Frown" />
         <combo_box.item
-         label="Kiss" />
+         label="Kiss"
+         name="Kiss" />
         <combo_box.item
-         label="Laugh" />
+         label="Laugh"
+         name="Laugh" />
         <combo_box.item
-         label="Plllppt" />
+         label="Plllppt"
+         name="Plllppt" />
         <combo_box.item
-         label="Repulsed" />
+         label="Repulsed"
+         name="Repulsed" />
         <combo_box.item
-         label="Sad" />
+         label="Sad"
+         name="Sad" />
         <combo_box.item
-         label="Shrug" />
+         label="Shrug"
+         name="Shrug" />
         <combo_box.item
-         label="Smile" />
+         label="Smile"
+         name="Smile" />
         <combo_box.item
-         label="Surprise" />
+         label="Surprise"
+         name="Surprise" />
         <combo_box.item
-         label="Wink" />
+         label="Wink"
+         name="Wink" />
         <combo_box.item
-         label="Worry" />
+         label="Worry"
+         name="Worry" />
     </combo_box>
     <text
      type="string"
@@ -371,13 +404,17 @@ Maximum animation length is [MAX_LENGTH] seconds.
      top_delta="-1"
      width="104">
         <combo_box.item
-         label="Standing" />
+         label="Standing"
+         name="Standing" />
         <combo_box.item
-         label="Walking" />
+         label="Walking"
+         name="Walking" />
         <combo_box.item
-         label="Sitting" />
+         label="Sitting"
+         name="Sitting" />
         <combo_box.item
-         label="Flying" />
+         label="Flying"
+         name="Flying" />
     </combo_box>
     <spinner
      follows="left|top"
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 e11534cc13..8e0ea68f27 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -531,11 +531,14 @@ sold with objects
      name="account_level"
      width="336">
         <combo_box.item
-         label="US$9.95/month, billed monthly" />
+         label="US$9.95/month, billed monthly"
+         name="US$9.95/month,billedmonthly" />
         <combo_box.item
-         label="US$7.50/month, billed quarterly" />
+         label="US$7.50/month, billed quarterly"
+         name="US$7.50/month,billedquarterly" />
         <combo_box.item
-         label="US$6.00/month, billed annually" />
+         label="US$6.00/month, billed annually"
+         name="US$6.00/month,billedannually" />
     </combo_box>
     <locate
      height="10"
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 f3abad8cb2..0359f90ea6 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -717,9 +717,11 @@
              width="290">
                 <combo_box.item
                  label="Selection"
+                 name="item1"
                  value="Selection" />
                 <combo_box.item
                  label="Agent Region"
+                 name="item2"
                  value="Agent Region" />
             </combo_box>
             <text
@@ -744,15 +746,19 @@
              width="290">
                 <combo_box.item
                  label="colliders &lt;steps&gt;"
+                 name="item1"
                  value="colliders &lt;steps&gt;" />
                 <combo_box.item
                  label="scripts &lt;count&gt;,&lt;optional pattern&gt;"
+                 name="item2"
                  value="scripts &lt;count&gt;,&lt;optional pattern&gt;" />
                 <combo_box.item
                  label="objects &lt;pattern&gt;"
+                 name="item3"
                  value="objects &lt;pattern&gt;" />
                 <combo_box.item
                  label="rez &lt;asset_id&gt;"
+                 name="item4"
                  value="rez &lt;asset_id&gt;" />
             </combo_box>
             <text
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 f0e2911fd8..19fba52500 100644
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -50,18 +50,23 @@
      width="64">
         <combo_box.item
          label="Disabled"
+         name="FSAADisabled"
          value="0" />
         <combo_box.item
          label="2x"
+         name="2x"
          value="2" />
         <combo_box.item
          label="4x"
+         name="4x"
          value="4" />
         <combo_box.item
          label="8x"
+         name="8x"
          value="8" />
         <combo_box.item
          label="16x"
+         name="16x"
          value="16" />
     </combo_box>
     <spinner
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 907376b1e9..6fface12a3 100644
--- a/indra/newview/skins/default/xui/en/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml
@@ -61,25 +61,35 @@
      top_delta="3"
      width="160">
         <combo_box.item
-         label="Image" />
+         label="Image"
+         name="Image" />
         <combo_box.item
-         label="Hair" />
+         label="Hair"
+         name="Hair" />
         <combo_box.item
-         label="Female Head" />
+         label="Female Head"
+         name="FemaleHead" />
         <combo_box.item
-         label="Female Upper Body" />
+         label="Female Upper Body"
+         name="FemaleUpperBody" />
         <combo_box.item
-         label="Female Lower Body" />
+         label="Female Lower Body"
+         name="FemaleLowerBody" />
         <combo_box.item
-         label="Male Head" />
+         label="Male Head"
+         name="MaleHead" />
         <combo_box.item
-         label="Male Upper Body" />
+         label="Male Upper Body"
+         name="MaleUpperBody" />
         <combo_box.item
-         label="Male Lower Body" />
+         label="Male Lower Body"
+         name="MaleLowerBody" />
         <combo_box.item
-         label="Skirt" />
+         label="Skirt"
+         name="Skirt" />
         <combo_box.item
-         label="Sculpted Prim" />
+         label="Sculpted Prim"
+         name="SculptedPrim" />
     </combo_box>
     <text
      type="string"
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 4c036f98e5..fcbc27a5f9 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -178,120 +178,159 @@
      width="356">
         <combo_box.item
          label="Select category"
+         name="Select_category"
          value="0" />
         <combo_box.item
          label="Age &gt; Age play"
+         name="Age__Age_play"
          value="31" />
         <combo_box.item
          label="Age &gt; Adult resident on Teen Second Life"
+         name="Age__Adult_resident_on_Teen_Second_Life"
          value="32" />
         <combo_box.item
          label="Age &gt; Underage resident outside of Teen Second Life"
+         name="Age__Underage_resident_outside_of_Teen_Second_Life"
          value="33" />
         <combo_box.item
          label="Assault &gt; Combat sandbox / unsafe area"
+         name="Assault__Combat_sandbox___unsafe_area"
          value="34" />
         <combo_box.item
          label="Assault &gt; Safe area"
+         name="Assault__Safe_area"
          value="35" />
         <combo_box.item
          label="Assault &gt; Weapons testing sandbox"
+         name="Assault__Weapons_testing_sandbox"
          value="36" />
         <combo_box.item
          label="Commerce &gt; Failure to deliver product or service"
+         name="Commerce__Failure_to_deliver_product_or_service"
          value="38" />
         <combo_box.item
          label="Disclosure &gt; Real world information"
+         name="Disclosure__Real_world_information"
          value="39" />
         <combo_box.item
          label="Disclosure &gt; Remotely monitoring chat"
+         name="Disclosure__Remotely_monitoring chat"
          value="40" />
         <combo_box.item
          label="Disclosure &gt; Second Life information/chat/IMs"
+         name="Disclosure__Second_Life_information_chat_IMs"
          value="41" />
         <combo_box.item
          label="Disturbing the peace &gt; Unfair use of region resources"
+         name="Disturbing_the_peace__Unfair_use_of_region_resources"
          value="42" />
         <combo_box.item
          label="Disturbing the peace &gt; Excessive scripted objects"
+         name="Disturbing_the_peace__Excessive_scripted_objects"
          value="43" />
         <combo_box.item
          label="Disturbing the peace &gt; Object littering"
+         name="Disturbing_the_peace__Object_littering"
          value="44" />
         <combo_box.item
          label="Disturbing the peace &gt; Repetitive spam"
+         name="Disturbing_the_peace__Repetitive_spam"
          value="45" />
         <combo_box.item
          label="Disturbing the peace &gt; Unwanted advert spam"
+         name="Disturbing_the_peace__Unwanted_advert_spam"
          value="46" />
         <combo_box.item
          label="Fraud &gt; L$"
+         name="Fraud__L$"
          value="47" />
         <combo_box.item
          label="Fraud &gt; Land"
+         name="Fraud__Land"
          value="48" />
         <combo_box.item
          label="Fraud &gt; Pyramid scheme or chain letter"
+         name="Fraud__Pyramid_scheme_or_chain_letter"
          value="49" />
         <combo_box.item
          label="Fraud &gt; US$"
+         name="Fraud__US$"
          value="50" />
         <combo_box.item
          label="Harassment &gt; Advert farms / visual spam"
+         name="Harassment__Advert_farms___visual_spam"
          value="51" />
         <combo_box.item
          label="Harassment &gt; Defaming individuals or groups"
+         name="Harassment__Defaming_individuals_or_groups"
          value="52" />
         <combo_box.item
          label="Harassment &gt; Impeding movement"
+         name="Harassment__Impeding_movement"
          value="53" />
         <combo_box.item
          label="Harassment &gt; Sexual harassment"
+         name="Harassment__Sexual_harassment"
          value="54" />
         <combo_box.item
          label="Harassment &gt; Solicting/inciting others to violate ToS"
+         name="Harassment__Solicting_inciting_others_to_violate_ToS"
          value="55" />
         <combo_box.item
          label="Harassment &gt; Verbal abuse"
+         name="Harassment__Verbal_abuse"
          value="56" />
         <combo_box.item
          label="Indecency &gt; Broadly offensive content or conduct"
+         name="Indecency__Broadly_offensive_content_or_conduct"
          value="57" />
         <combo_box.item
          label="Indecency &gt; Inappropriate avatar name"
+         name="Indecency__Inappropriate_avatar_name"
          value="59" />
         <combo_box.item
          label="Indecency &gt; Inappropriate content or conduct in a PG region"
+         name="Indecency__Mature_content_in_PG_region"
          value="60" />
         <combo_box.item
          label="Indecency &gt; Inappropriate content or conduct in a Mature region"
+         name="Indecency__Inappropriate_content_in_Mature_region"
          value="69" />
         <combo_box.item
          label="Intellectual property infringement &gt; Content Removal"
+         name="Intellectual_property_infringement_Content_Removal"
          value="66" />
         <combo_box.item
          label="Intellectual property infringement &gt; CopyBot or Permissions Exploit"
+         name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"
          value="37" />
         <combo_box.item
          label="Intolerance"
+         name="Intolerance"
          value="61" />
         <combo_box.item
          label="Land &gt; Abuse of sandbox resources"
+         name="Land__Abuse_of_sandbox_resources"
          value="62" />
         <combo_box.item
          label="Land &gt; Encroachment &gt; Objects/textures"
+         name="Land__Encroachment__Objects_textures"
          value="63" />
         <combo_box.item
          label="Land &gt; Encroachment &gt; Particles"
+         name="Land__Encroachment__Particles"
          value="64" />
         <combo_box.item
          label="Land &gt; Encroachment &gt; Trees/plants"
+         name="Land__Encroachment__Trees_plants"
          value="65" />
         <combo_box.item
          label="Wagering/gambling"
+         name="Wagering_gambling"
          value="67" />
         <combo_box.item
          label="Other"
+         name="Other"
          value="68" />
     </combo_box>
     <text
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 2b6f2d5dde..052a880537 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -186,13 +186,16 @@ or a particular buyer.
      width="130">
         <combo_box.item
          enabled="false"
-         label="select one --"
+         label="-- select one --"
+         name="--selectone--"
          value="select" />
         <combo_box.item
          label="Anyone"
+         name="Anyone"
          value="anyone" />
         <combo_box.item
          label="Specific user:"
+         name="Specificuser:"
          value="user" />
     </combo_box>
     <line_editor
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 9a73ffb1a2..3c046fa5d7 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
@@ -40,9 +40,11 @@
      width="100">
         <combo_box.item
          label="TRUE"
+         name="TRUE"
          value="true" />
         <combo_box.item
          label="FALSE"
+         name="FALSE"
          value="" />
          <combo_box.commit_callback
            function="CommitSettings" />
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index f3d8938ea2..1d2978adb8 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -172,18 +172,23 @@
      width="115">
         <combo_box.item
          label="Current Window"
+         name="CurrentWindow"
          value="[i0,i0]" />
         <combo_box.item
          label="640x480"
+         name="640x480"
          value="[i640,i480]" />
         <combo_box.item
          label="800x600"
+         name="800x600"
          value="[i800,i600]" />
         <combo_box.item
          label="1024x768"
+         name="1024x768"
          value="[i1024,i768]" />
         <combo_box.item
          label="Custom"
+         name="Custom"
          value="[i-1,i-1]" />
     </combo_box>
     <combo_box
@@ -196,18 +201,23 @@
      width="115">
         <combo_box.item
          label="Current Window"
+         name="CurrentWindow"
          value="[i0,i0]" />
         <combo_box.item
          label="Small (128x128)"
+         name="Small(128x128)"
          value="[i128,i128]" />
         <combo_box.item
          label="Medium (256x256)"
+         name="Medium(256x256)"
          value="[i256,i256]" />
         <combo_box.item
          label="Large (512x512)"
+         name="Large(512x512)"
          value="[i512,i512]" />
         <combo_box.item
          label="Custom"
+         name="Custom"
          value="[i-1,i-1]" />
     </combo_box>
     <combo_box
@@ -220,27 +230,35 @@
      width="115">
         <combo_box.item
          label="Current Window"
+         name="CurrentWindow"
          value="[i0,i0]" />
         <combo_box.item
          label="320x240"
+         name="320x240"
          value="[i320,i240]" />
         <combo_box.item
          label="640x480"
+         name="640x480"
          value="[i640,i480]" />
         <combo_box.item
          label="800x600"
+         name="800x600"
          value="[i800,i600]" />
         <combo_box.item
          label="1024x768"
+         name="1024x768"
          value="[i1024,i768]" />
         <combo_box.item
          label="1280x1024"
+         name="1280x1024"
          value="[i1280,i1024]" />
         <combo_box.item
          label="1600x1200"
+         name="1600x1200"
          value="[i1600,i1200]" />
         <combo_box.item
          label="Custom"
+         name="Custom"
          value="[i-1,i-1]" />
     </combo_box>
     <combo_box
@@ -252,11 +270,14 @@
      top_delta="0"
      width="70">
         <combo_box.item
-         label="PNG" />
+         label="PNG"
+         name="PNG" />
         <combo_box.item
-         label="JPEG" />
+         label="JPEG"
+         name="JPEG" />
         <combo_box.item
-         label="BMP" />
+         label="BMP"
+         name="BMP" />
     </combo_box>
     <spinner
      allow_text_entry="false"
@@ -329,12 +350,15 @@
      width="145">
         <combo_box.item
          label="Colors"
+         name="Colors"
          value="colors" />
         <combo_box.item
          label="Depth"
+         name="Depth"
          value="depth" />
         <combo_box.item
          label="Object Mattes"
+         name="ObjectMattes"
          value="objects" />
     </combo_box>
     <check_box
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 4bc1b8b644..d327ddbb30 100644
--- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml
@@ -28,12 +28,15 @@
      width="155">
         <combo_box.item
          label="My Last Location"
+         name="MyLastLocation"
          value="last" />
         <combo_box.item
          label="My Home"
+         name="MyHome"
          value="home" />
         <combo_box.item
          label="&lt;Type region name&gt;"
+         name="Typeregionname"
          value="" />
     </combo_box>
     <text
@@ -55,9 +58,11 @@
      width="150">
         <combo_box.item
          label="First Item"
+         name="item1"
          value="first" />
         <combo_box.item
          label="Second Item"
+         name="item2"
          value="second" />
     </combo_box>
     <text
@@ -80,9 +85,11 @@
      width="150">
         <combo_box.item
          label="First Item"
+         name="item1"
          value="first" />
         <combo_box.item
          label="Second Item"
+         name="item2"
          value="second" />
     </combo_box>
     <text
@@ -106,9 +113,11 @@
      width="150">
         <combo_box.item
          label="First Item"
+         name="item1"
          value="first" />
         <combo_box.item
          label="Second Item"
+         name="item2"
          value="second" />
     </combo_box>
     <text
@@ -132,12 +141,15 @@
      width="150">
         <combo_box.item
          label="CA"
+         name="item1"
          value="ca" />
         <combo_box.item
          label="NY"
+         name="item2"
          value="ny" />
         <combo_box.item
          label="TX"
+         name="item3"
          value="tx" />
     </combo_box>
 </floater>
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 9a2602db75..c6b158fe6f 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -126,8 +126,10 @@
    tool_tip="combo box" 
    name="test_combo_box">
     <combo_box.item
+     name="item1"
      label="Combobox Item 1" />
     <combo_box.item
+     name="item2"
      label="Combobox Item 2" />
   </combo_box>
   <!-- "icon" is a read-only image.  The image_name must match an entry
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 83cbbd410b..abbc63a6d4 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -245,12 +245,15 @@
      width="90">
         <combo_box.item
          label="World"
+         name="World"
          value="World" />
         <combo_box.item
          label="Local"
+         name="Local"
          value="Local" />
         <combo_box.item
          label="Reference"
+         name="Reference"
          value="Reference" />
     </combo_box>
     <check_box
@@ -952,25 +955,32 @@
              left_pad="0">
                 <combo_box.item
                  label="Touch  (default)"
+                 name="Touch/grab(default)"
                  value="Touch/grab (default)" />
                 <combo_box.item
                  label="Sit on object"
+                 name="Sitonobject"
                  value="Sit on object" />
                 <combo_box.item
                  label="Buy object"
+                 name="Buyobject"
                  value="Buy object" />
                 <combo_box.item
                  label="Pay object"
+                 name="Payobject"
                  value="Pay object" />
                 <combo_box.item
                  label="Open"
+                 name="Open"
                  value="Open" />
 <!--TODO: Kill this-->
 <!--                <combo_box.item
                  label="Play parcel media"
+                 name="Play"
                  value="Play" />
                 <combo_box.item
                  label="Open parcel media"
+                 name="Opemmedia"
                  value="Open Media" />-->
             </combo_box>
             <check_box
@@ -1325,24 +1335,31 @@
              width="95">
                 <combo_box.item
                  label="Stone"
+                 name="Stone"
                  value="Stone" />
                 <combo_box.item
                  label="Metal"
+                 name="Metal"
                  value="Metal" />
                 <combo_box.item
                  label="Glass"
+                 name="Glass"
                  value="Glass" />
                 <combo_box.item
                  label="Wood"
+                 name="Wood"
                  value="Wood" />
                 <combo_box.item
                  label="Flesh"
+                 name="Flesh"
                  value="Flesh" />
                 <combo_box.item
                  label="Plastic"
+                 name="Plastic"
                  value="Plastic" />
                 <combo_box.item
                  label="Rubber"
+                 name="Rubber"
                  value="Rubber" />
             </combo_box>
             <text
@@ -1540,27 +1557,35 @@
              width="150">
                 <combo_box.item
                  label="Box"
+                 name="Box"
                  value="Box" />
                 <combo_box.item
                  label="Cylinder"
+                 name="Cylinder"
                  value="Cylinder" />
                 <combo_box.item
                  label="Prism"
+                 name="Prism"
                  value="Prism" />
                 <combo_box.item
                  label="Sphere"
+                 name="Sphere"
                  value="Sphere" />
                 <combo_box.item
                  label="Torus"
+                 name="Torus"
                  value="Torus" />
                 <combo_box.item
                  label="Tube"
+                 name="Tube"
                  value="Tube" />
                 <combo_box.item
                  label="Ring"
+                 name="Ring"
                  value="Ring" />
                 <combo_box.item
                  label="Sculpted"
+                 name="Sculpted"
                  value="Sculpted" />
             </combo_box>
             <text
@@ -1671,15 +1696,19 @@
              width="150">
                 <combo_box.item
                  label="Default"
+                 name="Default"
                  value="Default" />
                 <combo_box.item
                  label="Circle"
+                 name="Circle"
                  value="Circle" />
                 <combo_box.item
                  label="Square"
+                 name="Square"
                  value="Square" />
                 <combo_box.item
                  label="Triangle"
+                 name="Triangle"
                  value="Triangle" />
             </combo_box>
             <text
@@ -2022,19 +2051,24 @@
              visible="false"
              width="150">
                 <combo_box.item
-                 label="none)"
+                 label="(none)"
+                 name="None"
                  value="None" />
                 <combo_box.item
                  label="Sphere"
+                 name="Sphere"
                  value="Sphere" />
                 <combo_box.item
                  label="Torus"
+                 name="Torus"
                  value="Torus" />
                 <combo_box.item
                  label="Plane"
+                 name="Plane"
                  value="Plane" />
                 <combo_box.item
                  label="Cylinder"
+                 name="Cylinder"
                  value="Cylinder" />
             </combo_box>
         </panel>
@@ -2379,9 +2413,11 @@
              width="80">
                 <combo_box.item
                  label="Default"
+                 name="Default"
                  value="Default" />
                 <combo_box.item
                  label="Planar"
+                 name="Planar"
                  value="Planar" />
             </combo_box>
             <text
@@ -2405,15 +2441,19 @@
              width="70">
                 <combo_box.item
                  label="None"
+                 name="None"
                  value="None" />
                 <combo_box.item
                  label="Low"
+                 name="Low"
                  value="Low" />
                 <combo_box.item
                  label="Medium"
+                 name="Medium"
                  value="Medium" />
                 <combo_box.item
                  label="High"
+                 name="High"
                  value="High" />
             </combo_box>
             <text
@@ -2437,57 +2477,75 @@
              width="80">
                 <combo_box.item
                  label="None"
+                 name="None"
                  value="None" />
                 <combo_box.item
                  label="Brightness"
+                 name="Brightness"
                  value="Brightness" />
                 <combo_box.item
                  label="Darkness"
+                 name="Darkness"
                  value="Darkness" />
                 <combo_box.item
                  label="woodgrain"
+                 name="woodgrain"
                  value="woodgrain" />
                 <combo_box.item
                  label="bark"
+                 name="bark"
                  value="bark" />
                 <combo_box.item
                  label="bricks"
+                 name="bricks"
                  value="bricks" />
                 <combo_box.item
                  label="checker"
+                 name="checker"
                  value="checker" />
                 <combo_box.item
                  label="concrete"
+                 name="concrete"
                  value="concrete" />
                 <combo_box.item
                  label="crustytile"
+                 name="crustytile"
                  value="crustytile" />
                 <combo_box.item
                  label="cutstone"
+                 name="cutstone"
                  value="cutstone" />
                 <combo_box.item
                  label="discs"
+                 name="discs"
                  value="discs" />
                 <combo_box.item
                  label="gravel"
+                 name="gravel"
                  value="gravel" />
                 <combo_box.item
                  label="petridish"
+                 name="petridish"
                  value="petridish" />
                 <combo_box.item
                  label="siding"
+                 name="siding"
                  value="siding" />
                 <combo_box.item
                  label="stonetile"
+                 name="stonetile"
                  value="stonetile" />
                 <combo_box.item
                  label="stucco"
+                 name="stucco"
                  value="stucco" />
                 <combo_box.item
                  label="suction"
+                 name="suction"
                  value="suction" />
                 <combo_box.item
                  label="weave"
+                 name="weave"
                  value="weave" />
             </combo_box>
             <text
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 10968364f3..6934fad495 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -41,6 +41,7 @@
          width="55">
             <combo_box.item
              label="en"
+             name="item1"
              value="en" />
         </combo_box>
         <button
@@ -136,6 +137,7 @@
          width="55">
             <combo_box.item
              label="en"
+             name="item1"
              value="en" />
         </combo_box>
         <button
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 b179190819..3a0bdbe75b 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -327,6 +327,7 @@
      width="202">
         <combo_box.item
          label="Online Friends"
+         name="item1"
          value="None" />
 		<combo_box.commit_callback
 		function="WMap.AvatarCombo"/>
@@ -356,6 +357,7 @@
      width="202">
         <combo_box.item
          label="Landmarks"
+         name="item1"
          value="None" />
 		 <combo_box.commit_callback
 		function="WMap.Landmark" />
diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml
index f2cec86b38..3acd8fae4b 100644
--- a/indra/newview/skins/default/xui/en/panel_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified.xml
@@ -108,13 +108,16 @@
      width="130">
         <combo_box.item
          label="- Select Mature -"
+         name="select_mature"
          value="Select" />
         <combo_box.item
          label="Mature Content"
+         name="mature"
          value="Mature" />
         <combo_box.item
          label="PG Content"
-         value="Not Mature" />
+         name="pg"
+         value="PG" />
     </combo_box>
     <combo_box
      bottom="45"
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index b79f5f09d9..489d06abfd 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -275,13 +275,16 @@ Be aware that if nobody else joins this group within 48 hours, it will be disban
          width="120">
             <combo_box.item
              label="Select Mature -"
+             name="select_mature"
              value="Select" />
             <combo_box.item
              label="Mature Content"
+             name="mature"
              value="Mature" />
             <combo_box.item
              label="PG Content"
-             value="Not Mature" />
+             name="pg"
+             value="PG" />
         </combo_box>
         <text
          type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 20da8aa41e..5ee73c1242 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -136,12 +136,15 @@
      width="155">
         <combo_box.item
          label="My Last Location"
+         name="MyLastLocation"
          value="last" />
         <combo_box.item
          label="My Home"
+         name="MyHome"
          value="home" />
         <combo_box.item
          label="&lt;Type region name&gt;"
+         name="Typeregionname"
          value="" />
     </combo_box>
     <check_box
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 6b6191e6eb..2f08bb816e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -163,18 +163,22 @@ Beware the Trout!
         <combo_box.item
          enabled="true"
          label="4:3 (Standard CRT)"
+         name="item1"
          value="1.333333" />
         <combo_box.item
          enabled="true"
          label="5:4 (1280x1024 LCD)"
+         name="item2"
          value="1.25" />
         <combo_box.item
          enabled="true"
          label="8:5 (Widescreen)"
+         name="item3"
          value="1.6" />
         <combo_box.item
          enabled="true"
          label="16:9 (Widescreen)"
+         name="item4"
          value="1.7777777" />
     </combo_box>
     <check_box
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 8b88afa9b2..6ca88a51a9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -34,74 +34,92 @@
         <combo_box.item
          enabled="true"
          label="System Default"
+         name="System Default Language"
          value="default" />
         <combo_box.item
          enabled="true"
          label="English"
+         name="English"
          value="en" />
         <combo_box.item
          enabled="true"
          label="Dansk (Danish) - Beta"
+         name="Danish"
          value="da" />
         <combo_box.item
          enabled="true"
          label="Deutsch (German) - Beta"
+         name="Deutsch(German)"
          value="de" />
         <combo_box.item
          enabled="true"
          label="Español (Spanish) - Beta"
+         name="Spanish"
          value="es" />
         <combo_box.item
          enabled="true"
          label="Français (French) - Beta"
+         name="French"
          value="fr" />
         <combo_box.item
          enabled="true"
          label="Italiano (Italian) - Beta"
+         name="Italian"
          value="it" />
         <combo_box.item
          enabled="true"
          label="Magyar (Hungarian) - Beta"
+         name="Hungarian"
          value="hu" />
         <combo_box.item
          enabled="true"
          label="Nederlands (Dutch) - Beta"
+         name="Dutch"
          value="nl" />
         <combo_box.item
          enabled="true"
          label="Polski (Polish) - Beta"
+         name="Polish"
          value="pl" />
         <combo_box.item
          enabled="true"
          label="Portugués (Portuguese) - Beta"
+         name="Portugese"
          value="pt" />
         <combo_box.item
          enabled="true"
          label="Русский (Russian) - Beta"
+         name="Russian"
          value="ru" />
         <combo_box.item
          enabled="true"
          label="Türkçe (Turkish) - Beta"
+         name="Turkish"
          value="tr" />
         <combo_box.item
          enabled="true"
          label="Українська (Ukrainian) - Beta"
+         name="Ukrainian"
          value="uk" />
         <combo_box.item
          enabled="true"
          label="中文 (简体) (Chinese) - Beta"
+         name="Chinese"
          value="zh" />
         <combo_box.item
          enabled="true"
          label="日本語 (Japanese) - Beta"
+         name="(Japanese)"
          value="ja" />
         <combo_box.item
          enabled="true"
          label="한국어 (Korean) - Beta"
+         name="(Korean)"
          value="ko" />
         <combo_box.item
          enabled="true"
          label="Test Language"
+         name="TestLanguage"
          value="test" />
     </combo_box>
     <text
@@ -134,17 +152,20 @@
      height="18"
      layout="topleft"
      left_delta="50"
-     name="start_location_combo"
+     name="maturity_desired_combobox"
      top_pad="10"
      width="155">
         <combo_box.item
          label="PG, Mature and Adult"
+         name="Desired_Adult"
          value="42" />
         <combo_box.item
          label="PG and Mature"
+         name="Desired_Mature"
          value="21" />
         <combo_box.item
          label="PG"
+         name="Desired_PG"
          value="13" />
     </combo_box>
     <text
@@ -170,9 +191,11 @@
      width="155">
         <combo_box.item
          label="My Last Location"
+         name="MyLastLocation"
          value="last" />
         <combo_box.item
          label="My Home"
+         name="MyHome"
          value="home" />
     </combo_box>
     <check_box
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 61ba76aa28..fb83ab859c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -53,18 +53,22 @@
         <combo_box.item
          enabled="true"
          label="4:3 (Standard CRT)"
+         name="item1"
          value="1.333333" />
         <combo_box.item
          enabled="true"
          label="5:4 (1280x1024 LCD)"
+         name="item2"
          value="1.25" />
         <combo_box.item
          enabled="true"
          label="8:5 (Widescreen)"
+         name="item3"
          value="1.6" />
         <combo_box.item
          enabled="true"
          label="16:9 (Widescreen)"
+         name="item4"
          value="1.7777777" />
 		 <combo_box.commit_callback
          function="setControlFalse"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 1af3c6511d..8b5591e832 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -232,12 +232,15 @@
                  width="150">
                     <combo_box.item
                      label="Online"
+                     name="online"
                      value="online" />
                     <combo_box.item
                      label="Away"
+                     name="away"
                      value="away" />
                     <combo_box.item
                      label="Busy"
+                     name="busy"
                      value="busy" />
                 </combo_box>
                 <text
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 8ea1a05e97..b7a32213cf 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -283,12 +283,15 @@
      width="85">
         <combo_box.item
          label="Adult"
+         name="Adult"
          value="42" />
         <combo_box.item
          label="Mature"
+         name="Mature"
          value="21" />
         <combo_box.item
          label="PG"
+         name="PG"
          value="13" />
     </combo_box> 
     <button
-- 
cgit v1.2.3