Backed out changeset d5b761982e63

This got pushed too early - sorry.  Sigh.

1 files changed, 60 insertions, 60 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index ddc0d9af72..0dc7d62b19 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -260,9 +260,10 @@
              left="10"
              name="not worn instructions"
              top="31"
-             word_wrap="true"
              width="373">
-                Put on a new shape by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new shape by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -273,7 +274,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -300,7 +300,7 @@
              left="10"
              name="Create New"
              top="104"
-             width="160" />
+             width="140" />
             <button
              follows="right|bottom"
              height="23"
@@ -463,9 +463,10 @@
              left="10"
              name="not worn instructions"
              top="31"
-             word_wrap="true"
              width="373">
-                Put on a new skin by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new skin by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -476,7 +477,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -542,7 +542,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-249"
-             width="160" />
+             width="120" />
             <button
              follows="right|bottom"
              height="23"
@@ -713,9 +713,10 @@
              left="10"
              name="not worn instructions"
              top="31"
-             word_wrap="true"
              width="373">
-                Put on a new hair by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new hair by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -726,7 +727,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -765,7 +765,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-89"
-             width="160" />
+             width="120" />
             <button
              follows="right|bottom"
              height="23"
@@ -898,9 +898,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new eyes by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -911,7 +912,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -950,7 +950,7 @@
              left_delta="0"
              name="Create New"
              top_delta="39"
-             width="160" />
+             width="120" />
             <button
              follows="right|bottom"
              height="23"
@@ -1056,7 +1056,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="160" />
+             width="120" />
             <button
              follows="left|top"
              height="23"
@@ -1170,9 +1170,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on a new shirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new shirt by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -1183,7 +1184,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1262,7 +1262,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="160" />
+             width="120" />
             <button
              follows="left|top"
              height="23"
@@ -1376,9 +1376,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on new pants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new pants by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -1389,7 +1390,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1509,9 +1509,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on a new pair of shoes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new shoes by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -1522,7 +1523,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1572,7 +1572,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="160" />
+             width="120" />
             <button
              follows="left|top"
              height="23"
@@ -1715,9 +1715,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on new socks by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new socks by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -1728,7 +1729,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1778,7 +1778,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="160" />
+             width="120" />
             <button
              follows="left|top"
              height="23"
@@ -1921,9 +1921,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on a new jacket by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new jacket by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -1934,7 +1935,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1996,7 +1996,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-121"
-             width="160" />
+             width="140" />
             <button
              follows="left|top"
              height="23"
@@ -2139,9 +2139,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on new gloves by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new gloves by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -2152,7 +2153,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2202,7 +2202,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="160" />
+             width="130" />
             <button
              follows="left|top"
              height="23"
@@ -2345,9 +2345,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on a new undershirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new undershirt by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -2358,7 +2359,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2551,9 +2551,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on new underpants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new underpants by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -2564,7 +2565,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2757,9 +2757,10 @@
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
-             word_wrap="true"
              width="373">
-                Put on a new skirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new skirt by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -2770,7 +2771,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2820,7 +2820,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="160" />
+             width="120" />
             <button
              follows="left|top"
              height="23"
@@ -2962,10 +2962,11 @@
              layout="topleft"
              left_delta="-2"
              name="not worn instructions"
-             top_pad="8"
-             word_wrap="true"
+             top_delta="2"
              width="373">
-                Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new alpha mask by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -2976,7 +2977,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -3108,7 +3108,7 @@
              left="8"
              name="Create New"
              top="104"
-             width="160" />
+             width="120" />
             <button
              follows="left|top"
              height="23"
@@ -3250,10 +3250,11 @@
              layout="topleft"
              left_delta="-2"
              name="not worn instructions"
-             top_pad="8"
-             word_wrap="true"
+             top_delta="2"
              width="373">
-                Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
+                Put on a new tattoo by dragging one from your inventory
+to your avatar. Alternately, you create a new one from
+scratch and wear it.
             </text>
             <text
              type="string"
@@ -3264,7 +3265,6 @@
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
-             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -3327,7 +3327,7 @@
              left_delta="0"
              name="Create New"
              top_delta="-121"
-             width="160" />
+             width="120" />
             <button
              follows="left|top"
              height="23"