diff options
Diffstat (limited to 'indra/newview')
5 files changed, 66 insertions, 31 deletions
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 ebce758d3d..41b1f99d41 100644 --- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml @@ -163,7 +163,7 @@ Maximum animation length is [MAX_LENGTH] seconds.       follows="top|left|right"       height="23"       layout="topleft" -     left="85" +     left="100"       name="name_form"       right="-10" />      <text @@ -182,7 +182,7 @@ Maximum animation length is [MAX_LENGTH] seconds.       follows="top|left|right"       height="23"       layout="topleft" -     left="85" +     left="100"       name="description_form"       right="-10" />      <spinner @@ -192,7 +192,7 @@ Maximum animation length is [MAX_LENGTH] seconds.       increment="1"       initial_value="0"       label="Priority" -     label_width="90" +     label_width="88"       layout="topleft"       left="10"       max_val="4" @@ -214,14 +214,14 @@ Maximum animation length is [MAX_LENGTH] seconds.       increment="1"       initial_value="0"       label="In(%)" -     label_width="35" +     label_width="49"       layout="topleft"       top_pad="5"       left="30"       max_val="100"       name="loop_in_point"       tool_tip="Sets point in animation that looping returns to" -     width="110" /> +     width="115" />      <spinner       bottom_delta="0"       follows="left|top" @@ -234,8 +234,8 @@ Maximum animation length is [MAX_LENGTH] seconds.       max_val="100"       name="loop_out_point"       tool_tip="Sets point in animation that ends a loop" -     label_width="45" -     width="120" /> +     label_width="49" +     width="115" />      <text       type="string"       length="1" @@ -243,6 +243,7 @@ Maximum animation length is [MAX_LENGTH] seconds.       follows="top|left"       height="23"       width="110" +     word_wrap="true"       layout="topleft"       left="10"       name="hand_label"> @@ -315,6 +316,7 @@ Maximum animation length is [MAX_LENGTH] seconds.       follows="top|left"       height="23"       width="110" +     word_wrap="true"       layout="topleft"       left="10"       name="emote_label"> @@ -395,6 +397,7 @@ Maximum animation length is [MAX_LENGTH] seconds.       follows="top|left"       height="23"       width="110" +     word_wrap="true"       layout="topleft"       left="10"       name="preview_label"> @@ -482,6 +485,8 @@ Maximum animation length is [MAX_LENGTH] seconds.      <text       type="string"       length="1" +     height="72" +     word_wrap="true"       top_pad="5"       text_color="EmphasisColor"       follows="top|left" diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml index f0e678af00..56230e912c 100644 --- a/indra/newview/skins/default/xui/en/floater_build_options.xml +++ b/indra/newview/skins/default/xui/en/floater_build_options.xml @@ -15,14 +15,14 @@       height="23"       initial_value="1"       label="Grid Units (meters)" -     label_width="130" +     label_width="160"       layout="topleft"       left="10"       max_val="5"       min_val="0.01"       name="GridResolution"       top="25" -     width="200" /> +     width="230" />      <spinner       control_name="GridDrawSize"       decimal_digits="1" @@ -31,14 +31,14 @@       increment="0.5"       initial_value="5"       label="Grid Extents (meters)" -     label_width="130" +     label_width="160"       layout="topleft"       left_delta="0"       max_val="50"       min_val="1"       name="GridDrawSize"       top_pad="0" -     width="200" /> +     width="230" />      <check_box       control_name="GridSubUnit"       height="16" 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 2562daf4b3..6f8f272128 100644 --- a/indra/newview/skins/default/xui/en/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml @@ -47,9 +47,11 @@      <text       type="string"       length="1" -     bottom_delta="20" +     bottom_delta="30"       follows="top|left" -     height="15" +     height="25" +     width="105" +     word_wrap="true"       layout="topleft"       name="preview_label">          Preview image as: @@ -96,7 +98,9 @@      <text       type="string"       length="1" -     bottom="190" +     bottom="225" +     height="45" +     word_wrap="true"       follows="top|left"       layout="topleft"       left="10" @@ -114,7 +118,7 @@ Try saving image as 24 bit Targa (.tga).       layout="topleft"       left_delta="2"       name="lossless_check" -     top_pad="197" +     top_pad="162"       width="280" />      <button       follows="bottom|right" diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml index d34820347d..5287ece227 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml @@ -106,7 +106,7 @@       left_delta="78"       name="LabelCreatorName"       top_delta="0" -     width="200"> +     width="170">          Nicole Linden      </text>      <button @@ -139,7 +139,7 @@       left_delta="78"       name="LabelOwnerName"       top_delta="0" -     width="200"> +     width="170">          Thrax Linden      </text>      <button @@ -255,12 +255,13 @@       type="string"       length="1"       follows="left|top" -     height="10" +     height="25"       layout="topleft"       left="10"       name="NextOwnerLabel"       top_pad="5" -     width="78"> +     width="78" +     word_wrap="true">          Next owner:      </text>      <check_box @@ -301,7 +302,7 @@       layout="topleft"       follows="left|top"       name="combobox sale copy" -     width="90"> +     width="110">          <combo_box.item           label="Copy"           name="Copy" @@ -318,13 +319,25 @@          control_name="Edit Cost"          name="Edit Cost"          label="Price: L$" -        label_width="60" +        label_width="100"          left="10" -        width="180" +        width="192"          min_val="1"          height="19"          max_val="999999999"          top_pad="5"/> +    <text +        type="string" +        length="1" +        height="15" +        follows="left|top" +        layout="topleft" +        left_delta="82" +        name="CurrencySymbol" +        top_delta="1" +        width="18"> +      L$ +    </text>      <!--line_editor       border_style="line" diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index 544d91fc51..db8a844eb0 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -126,7 +126,7 @@  		     left_delta="78"  		     name="LabelCreatorName"  		     top_delta="0" -		     width="200"> +		     width="140">  	        Nicole Linden  	     </text>  	     <button @@ -159,7 +159,7 @@  			 left_delta="78"  			 name="LabelOwnerName"  			 top_delta="0" -			 width="200"> +			 width="140">  			    Thrax Linden  	     </text>  	     <button @@ -192,7 +192,7 @@  			 left_delta="78"  			 name="LabelAcquiredDate"  			 top_delta="0" -			 width="252"> +			 width="222">  			Wed May 24 12:50:46 2006  	    </text>  	    <text @@ -275,12 +275,13 @@  			 type="string"  			 length="1"  			 follows="left|top" -			 height="10" +			 height="25"  			 layout="topleft"  			 left="10"  			 name="NextOwnerLabel"  			 top_pad="5" -			 width="78"> +			 width="78" +			 word_wrap="true">  			Next owner:  	    </text>  	    <check_box @@ -321,7 +322,7 @@  			 layout="topleft"  			 follows="left|top"  			 name="combobox sale copy" -			 width="90"> +			 width="110">  			<combo_box.item  			     label="Copy"  			     name="Copy" @@ -337,14 +338,26 @@  			    increment="1"  			    control_name="Edit Cost"  			    name="Edit Cost" -			    label="Price: L$" -			    label_width="60" +			    label="Price:" +			    label_width="100"  			    left="10" -			    width="180" +			    width="192"  			    min_val="1"  			    height="19"  			    max_val="999999999"  			    top_pad="5"/> +	    <text +			    type="string" +			    length="1" +			    height="15" +			    follows="left|top" +			    layout="topleft" +			    left_delta="82" +			    name="CurrencySymbol" +			    top_delta="1" +			    width="18"> +			L$ +	    </text>  	    <!--line_editor  			 border_style="line"  			 border_thickness="1"  | 
