Revert "Remove gender-based restrictions on shape and physics sliders"

This reverts commit 1ebd23ffed912a5c8c94d109f37a2c25cf169523.

13 files changed, 51 insertions, 24 deletions

diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 2e351cbc65..e4f99d14e9 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -2688,9 +2688,6 @@ 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 4a4a34911d..a9e7626dc5 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1248,7 +1248,6 @@ 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 b3aadb8ea1..85d73ece48 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -202,6 +202,57 @@
          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 87f866881d..7360c06f86 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3242,7 +3242,6 @@ Please reinstall viewer from  https://secondlife.com/support/downloads/ and cont
 <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 fd85cdc252..cd8e7687ae 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -1227,7 +1227,6 @@ 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 5969856086..0a3fbeb603 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1249,7 +1249,6 @@ 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 e12203c6b7..178bb90ca6 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -1229,7 +1229,6 @@ 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 8fe69162c5..fa6c329fe7 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -5052,9 +5052,6 @@ 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 a2d386e8ac..26ec6cc9dc 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -3318,9 +3318,6 @@ 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 5076e21198..6db5da2e89 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1192,7 +1192,6 @@ 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 8fc9641624..61d836a2d1 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -3479,9 +3479,6 @@ 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 687de84401..e709a4c5d6 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -3482,9 +3482,6 @@ 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 cf94391aa4..bdb16c9bf1 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -3475,9 +3475,6 @@ http://secondlife.com/support 求助解決問題。
 	<string name="Full Sides">
 		兩側飽滿
 	</string>
-	<string name="Gender">
-		性别
-	</string>
 	<string name="Glossy">
 		光亮
 	</string>