Remove gender-based restrictions on shape and physics sliders

14 files changed, 30 insertions, 104 deletions

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 2cdd86267e..9be6275929 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3822,7 +3822,6 @@
 	<param
      id="30879"
      group="1"
-     sex="male"
      name="Male_Package"
      value_min="-.5"
      value_max="2">
@@ -5813,7 +5812,6 @@
 
     <param
      id="400"
-     sex="male"
      group="1"
      name="Displace_Hair_Facial"
      label="Hair Thickess"
@@ -6838,7 +6836,6 @@
 
     <param
      id="626"
-     sex="female"
      group="1"
      name="Big_Chest"
      label="Chest Size"
@@ -6865,7 +6862,6 @@
 
     <param
      id="627"
-     sex="female"
      group="1"
      name="Small_Chest"
      label="Chest Size"
@@ -6891,7 +6887,6 @@
 
     <param
      id="843"
-     sex="female"
      group="1"
      name="No_Chest"
      label="Chest Size"
@@ -6920,7 +6915,6 @@
      group="1"
      name="Muscular_Torso"
      label="Torso Muscles"
-   sex="male"
      show_simple="true"
      wearable="shape"
      edit_group="shape_torso"
@@ -6963,7 +6957,6 @@
         group="1"
         name="Muscular_Torso"
         label="Torso Muscles"
-        sex="female"
         show_simple="true"
      wearable="shape"
      edit_group="shape_torso"
@@ -7004,7 +6997,6 @@
     <param
      id="648"
      group="1"
-     sex="female"
      name="Scrawny_Torso"
      label="Torso Muscles"
    show_simple="true"
@@ -7059,7 +7051,6 @@
     <param
      id="677"
      group="1"
-     sex="male"
      name="Scrawny_Torso_Male"
      label="Torso Scrawny"
      wearable="shape"
@@ -7192,7 +7183,6 @@
     <param
      id="507"
      group="0"
-     sex="female"
      name="Breast_Gravity"
      label="Breast Buoyancy"
      wearable="shape"
@@ -7279,7 +7269,6 @@
     <param
      id="684"
      group="0"
-     sex="female"
      name="Breast_Female_Cleavage"
      label="Breast Cleavage"
      wearable="shape"
@@ -7307,7 +7296,6 @@
     <param
      id="685"
      group="0"
-     sex="male"
      name="Chest_Male_No_Pecs"
      label="Pectorals"
      wearable="shape"
@@ -7525,7 +7513,6 @@
     <param
      id="1200"
      group="1"
-     sex="female"
      name="Breast_Physics_UpDown_Driven"
      wearable="physics"
      edit_group="driven"
@@ -7547,7 +7534,6 @@
     <param
      id="1201"
      group="1"
-     sex="female"
      name="Breast_Physics_InOut_Driven"
      wearable="physics"
      edit_group="driven"
@@ -8079,7 +8065,6 @@
     <param
      id="20879"
      group="1"
-     sex="male"
      name="Male_Package"
      value_min="-.5"
      value_max="2">
@@ -9837,7 +9822,6 @@ render_pass="bump">
 
       <param
        id="1004"
-       sex="male"
        group="1"
        wearable="hair"
        edit_group="driven"
@@ -9852,7 +9836,6 @@ render_pass="bump">
 
       <param
        id="1006"
-       sex="male"
        group="1"
        wearable="hair"
        edit_group="driven"
@@ -9867,7 +9850,6 @@ render_pass="bump">
 
       <param
        id="1008"
-       sex="male"
        group="1"
        wearable="hair"
        edit_group="driven"
@@ -9882,7 +9864,6 @@ render_pass="bump">
 
       <param
        id="1010"
-       sex="male"
        group="1"
        edit_group="driven"
        wearable="hair"
@@ -9898,7 +9879,6 @@ render_pass="bump">
       <param
        id="1012"
        group="1"
-       sex="male"
        wearable="hair"
        edit_group="driven"
        name="5 O'Clock Shadow bump"
@@ -9924,7 +9904,6 @@ render_pass="bump">
 
       <param
        id="1005"
-       sex="male"
        group="1"
        wearable="hair"
        edit_group="driven"
@@ -9939,7 +9918,6 @@ render_pass="bump">
 
       <param
        id="1007"
-       sex="male"
        group="1"
        wearable="hair"
        edit_group="driven"
@@ -9954,7 +9932,6 @@ render_pass="bump">
 
       <param
        id="1009"
-       sex="male"
        group="1"
        wearable="hair"
        edit_group="driven"
@@ -9969,7 +9946,6 @@ render_pass="bump">
 
       <param
        id="1011"
-       sex="male"
        group="1"
        wearable="hair"
        edit_group="driven"
@@ -9986,7 +9962,6 @@ render_pass="bump">
        id="751"
        group="1"
        wearable="hair"
-       sex="male"
        edit_group="hair_facial"
        name="5 O'Clock Shadow"
        label_min="Dense hair"
@@ -15097,7 +15072,6 @@ render_pass="bump">
     <param
      id="105"
      group="0"
-     sex="female"
      wearable="shape"
      edit_group="shape_torso"
      edit_group_order="6"
@@ -15262,7 +15236,6 @@ render_pass="bump">
     <param
      id="649"
      group="0"
-     sex="female"
      wearable="shape"
      edit_group="shape_torso"
      edit_group_order="1.1"
@@ -15297,7 +15270,6 @@ render_pass="bump">
     <param
      id="678"
      group="0"
-     sex="male"
      wearable="shape"
      edit_group="shape_torso"
      edit_group_order="1"
@@ -15365,10 +15337,14 @@ render_pass="bump">
      id="80"
      name="male"
      group="0"
-     edit_group="dummy"
+     edit_group="shape_body"
+     label="Gender"
+     label_min="Female"
+     label_max="Male"
      wearable="shape"
      value_min="0"
-     value_max="1">
+     value_max="1"
+     camera_distance="2.2">
       <param_driver>
         <driven
          id="32" />
@@ -15583,7 +15559,6 @@ render_pass="bump">
     <param
      id="752"
      group="0"
-     sex="male"
      wearable="hair"
      edit_group="hair_facial"
      edit_group_order="1"
@@ -15865,7 +15840,6 @@ render_pass="bump">
     <param
      id="879"
      group="0"
-     sex="male"
      name="Male_Package"
      label="Package"
      wearable="shape"
@@ -16053,7 +16027,6 @@ render_pass="bump">
 
     <param
      id="166"
-     sex="male"
      group="0"
      wearable="hair"
      edit_group="hair_facial"
@@ -16079,7 +16052,6 @@ render_pass="bump">
 
     <param
      id="167"
-     sex="male"
      group="0"
      wearable="hair"
      edit_group="hair_facial"
@@ -16105,7 +16077,6 @@ render_pass="bump">
 
     <param
      id="168"
-     sex="male"
      group="0"
      wearable="hair"
      edit_group="hair_facial"
@@ -16131,7 +16102,6 @@ render_pass="bump">
 
     <param
      id="169"
-     sex="male"
      group="0"
      wearable="hair"
      edit_group="hair_facial"
@@ -16944,7 +16914,6 @@ render_pass="bump">
    <param
      id="1100"
      group="1"
-     sex="female"
      wearable="physics"
      name="Breast_Physics_UpDown_Controller"
      label="Breast Physics UpDown Controller"
@@ -16960,7 +16929,6 @@ render_pass="bump">
    <param
      id="1101"
      group="1"
-     sex="female"
      wearable="physics"
      name="Breast_Physics_InOut_Controller"
      label="Breast Physics InOut Controller"
@@ -17040,7 +17008,6 @@ render_pass="bump">
     <param
      id="10000"
      group="0"
-     sex="female"
      name="Breast_Physics_Mass"
      label="Breast Physics Mass"
      wearable="physics"
@@ -17053,7 +17020,6 @@ render_pass="bump">
     <param
      id="10001"
      group="0"
-     sex="female"
      name="Breast_Physics_Gravity"
      label="Breast Physics Gravity"
      wearable="physics"
@@ -17067,7 +17033,6 @@ render_pass="bump">
    <param
      id="10002"
      group="0"
-     sex="female"
      name="Breast_Physics_Drag"
      label="Breast Physics Drag"
      wearable="physics"
@@ -17081,7 +17046,6 @@ render_pass="bump">
    <param
      id="10003"
      group="0"
-     sex="female"
      name="Breast_Physics_UpDown_Max_Effect"
      label="Breast Physics UpDown Max Effect"
      wearable="physics"
@@ -17094,7 +17058,6 @@ render_pass="bump">
     <param
      id="10004"
      group="0"
-     sex="female"
      name="Breast_Physics_UpDown_Spring"
      label="Breast Physics UpDown Spring"
      wearable="physics"
@@ -17107,7 +17070,6 @@ render_pass="bump">
     <param
      id="10005"
      group="0"
-     sex="female"
      name="Breast_Physics_UpDown_Gain"
      label="Breast Physics UpDown Gain"
      wearable="physics"
@@ -17120,7 +17082,6 @@ render_pass="bump">
     <param
      id="10006"
      group="0"
-     sex="female"
      name="Breast_Physics_UpDown_Damping"
      label="Breast Physics UpDown Damping"
      wearable="physics"
@@ -17134,7 +17095,6 @@ render_pass="bump">
    <param
      id="10007"
      group="0"
-     sex="female"
      name="Breast_Physics_InOut_Max_Effect"
      label="Breast Physics InOut Max Effect"
      wearable="physics"
@@ -17147,7 +17107,6 @@ render_pass="bump">
     <param
      id="10008"
      group="0"
-     sex="female"
      name="Breast_Physics_InOut_Spring"
      label="Breast Physics InOut Spring"
      wearable="physics"
@@ -17160,7 +17119,6 @@ render_pass="bump">
     <param
      id="10009"
      group="0"
-     sex="female"
      name="Breast_Physics_InOut_Gain"
      label="Breast Physics InOut Gain"
      wearable="physics"
@@ -17173,7 +17131,6 @@ render_pass="bump">
     <param
      id="10010"
      group="0"
-     sex="female"
      name="Breast_Physics_InOut_Damping"
      label="Breast Physics InOut Damping"
      wearable="physics"
@@ -17407,7 +17364,6 @@ render_pass="bump">
    <param
      id="10029"
      group="0"
-     sex="female"
      name="Breast_Physics_LeftRight_Max_Effect"
      label="Breast Physics LeftRight Max Effect"
      wearable="physics"
@@ -17420,7 +17376,6 @@ render_pass="bump">
     <param
      id="10030"
      group="0"
-     sex="female"
      name="Breast_Physics_LeftRight_Spring"
      label="Breast Physics LeftRight Spring"
      wearable="physics"
@@ -17433,7 +17388,6 @@ render_pass="bump">
     <param
      id="10031"
      group="0"
-     sex="female"
      name="Breast_Physics_LeftRight_Gain"
      label="Breast Physics LeftRight Gain"
      wearable="physics"
@@ -17446,7 +17400,6 @@ render_pass="bump">
     <param
      id="10032"
      group="0"
-     sex="female"
      name="Breast_Physics_LeftRight_Damping"
      label="Breast Physics LeftRight Damping"
      wearable="physics"
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index e4f99d14e9..2e351cbc65 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -2688,6 +2688,9 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="Full Sides">
 		Meget hår
 	</string>
+	<string name="Gender">
+		Køn
+	</string>
 	<string name="Glossy">
 		Skinnende
 	</string>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index a9e7626dc5..4a4a34911d 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1248,6 +1248,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Full Front">Vorne volles Haar</string>
 	<string name="Full Hair Sides">Seitlich volles Haar</string>
 	<string name="Full Sides">Volle Seiten</string>
+	<string name="Gender">Geschlecht</string>
 	<string name="Glossy">Glänzend</string>
 	<string name="Glove Fingers">Handschuhfinger</string>
 	<string name="Glove Length">Handschuhlänge</string>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 85d73ece48..b3aadb8ea1 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -202,57 +202,6 @@
          top="10"
          value="Shape:"
          width="150" />
-        <radio_group
-         control_name="AvatarSex"
-         follows="top|right"
-         height="20"
-         layout="topleft"
-         left="210"
-         name="sex_radio"
-         top="5"
-         width="110">
-            <radio_item
-             follows="all"
-             height="16"
-             label=""
-             layout="topleft"
-             left="0"
-             name="sex_male"
-             tool_tip="Male"
-             value="1"
-             width="40" />
-            <radio_item
-             follows="all"
-             height="16"
-             label=""
-             layout="topleft"
-             left_pad="10"
-             name="sex_female"
-             tool_tip="Female"
-             value="0"
-             width="40"/>
-        </radio_group>
-        <!--  graphical labels for the radio buttons above -->
-        <icon
-         follows="top|right"
-         height="16"
-         image_name="icons/Male.png"
-         layout="topleft"
-         left="230"
-         name="male_icon"
-         tool_tip="Male"
-         top="7"
-         width="16" />
-        <icon
-         follows="top|right"
-         height="16"
-         image_name="icons/Female.png"
-         layout="topleft"
-         left="280"
-         name="female_icon"
-         tool_tip="Female"
-         top="7"
-         width="16" />
         <line_editor
          follows="all"
          height="23"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3fbb5bc7e8..e7d1233890 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3232,6 +3232,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Full Front">Full Front</string>
 <string name="Full Hair Sides">Full Hair Sides</string>
 <string name="Full Sides">Full Sides</string>
+<string name="Gender">Gender</string>
 <string name="Glossy">Glossy</string>
 <string name="Glove Fingers">Glove Fingers</string>
 
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index cd8e7687ae..fd85cdc252 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -1227,6 +1227,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].</string>
 	<string name="Full Front">Sin cortar</string>
 	<string name="Full Hair Sides">Pelo: volumen a los lados</string>
 	<string name="Full Sides">Volumen total</string>
+	<string name="Gender">Sexo</string>
 	<string name="Glossy">Con brillo</string>
 	<string name="Glove Fingers">Guantes: dedos</string>
 	<string name="Glove Length">Guantes: largo</string>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 0a3fbeb603..5969856086 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1249,6 +1249,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].</string>
 	<string name="Full Front">Devant touffu</string>
 	<string name="Full Hair Sides">Côtés touffus</string>
 	<string name="Full Sides">Côtés touffus</string>
+	<string name="Gender">Sexe</string>
 	<string name="Glossy">Brillant</string>
 	<string name="Glove Fingers">Gants avec doigts</string>
 	<string name="Glove Length">Longueur</string>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 178bb90ca6..e12203c6b7 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -1229,6 +1229,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].</string>
 	<string name="Full Front">Anteriore gonfio</string>
 	<string name="Full Hair Sides">Lati capelli gonfi</string>
 	<string name="Full Sides">Lati gonfi</string>
+	<string name="Gender">Sesso</string>
 	<string name="Glossy">Lucido</string>
 	<string name="Glove Fingers">Dita con guanti</string>
 	<string name="Glove Length">Lunghezza guanti</string>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index fa6c329fe7..8fe69162c5 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -5052,6 +5052,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Full Sides">
 		生え揃ったサイド
 	</string>
+	<string name="Gender">
+		性別
+	</string>
 	<string name="Glossy">
 		あり
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 26ec6cc9dc..a2d386e8ac 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -3318,6 +3318,9 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 	<string name="Full Sides">
 		Gęste boki
 	</string>
+	<string name="Gender">
+		Płeć
+	</string>
 	<string name="Glossy">
 		Błyszcząca
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 6db5da2e89..5076e21198 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1192,6 +1192,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].</string>
 	<string name="Full Front">Frente cheia</string>
 	<string name="Full Hair Sides">Cabelos laterais cheios</string>
 	<string name="Full Sides">Lados cheios</string>
+	<string name="Gender">Sexo</string>
 	<string name="Glossy">Brilhante</string>
 	<string name="Glove Fingers">Dedos da luva</string>
 	<string name="Glove Length">Comprimento das luvas</string>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 61d836a2d1..8fc9641624 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -3479,6 +3479,9 @@ support@secondlife.com.
 	<string name="Full Sides">
 		По бокам
 	</string>
+	<string name="Gender">
+		Пол
+	</string>
 	<string name="Glossy">
 		Блестящие
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index e709a4c5d6..687de84401 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -3482,6 +3482,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="Full Sides">
 		Saçlar Yanda
 	</string>
+	<string name="Gender">
+		Cinsiyet
+	</string>
 	<string name="Glossy">
 		Parlak
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index bdb16c9bf1..cf94391aa4 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -3475,6 +3475,9 @@ http://secondlife.com/support 求助解決問題。
 	<string name="Full Sides">
 		兩側飽滿
 	</string>
+	<string name="Gender">
+		性别
+	</string>
 	<string name="Glossy">
 		光亮
 	</string>