From 6e46910d4f200f1d651d4656110336a94f7513e7 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 29 Sep 2009 21:18:03 -0700
Subject: Adjusted 2nd Life profile tab layout for French language

---
 ChangeLog.txt                                      |  9 ++-
 .../skins/default/xui/en-us/panel_avatar.xml       | 82 +++++++++++-----------
 2 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a4f6e70..5d44f61 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,8 +1,13 @@
-2009-09-28 McCabe Maxsted  <hakushakukun@gmail.com>
+2009-09-29 McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* Adjusted 2nd Life profile tab layout for French language.
+	
+	  modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+	  
+	  
 	* Added the name box back to avatar profiles.
 	
-	  linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+	  modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
 	  
 
 2009-09-28 McCabe Maxsted  <hakushakukun@gmail.com>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 1bdcaa0..b811a66 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -38,67 +38,67 @@
       </string>
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-23" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifsmall" h_pad="0" halign="left" height="16" right="-15"
-			     mouse_opaque="true" name="online_yes" v_pad="0" width="130">
+			     font="SansSerifsmall" h_pad="0" halign="left" height="16" right="-12"
+			     mouse_opaque="true" name="online_yes" v_pad="0" width="145">
         Currently: Online
       </text>
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifsmall" h_pad="0" halign="left" height="16" left_delta="0"
-			     mouse_opaque="true" name="online_no" v_pad="0" width="130">
+			     mouse_opaque="true" name="online_no" v_pad="0" width="145">
         Currently: Offline
       </text>
       <button bottom_delta="-19" font="SansSerif" halign="center" height="20"
 			     label="Instant Message..." label_selected="Instant Message..."
-			     right="-15" mouse_opaque="true" name="Instant Message..."
-			     tool_tip="Instant Message (IM)" width="130" />
+			     right="-12" mouse_opaque="true" name="Instant Message..."
+			     tool_tip="Instant Message (IM)" width="145" />
       <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
 			     label="Offer Teleport..." label_selected="Offer Teleport..."
-			     left_delta="0" mouse_opaque="true" name="Offer Teleport..." width="130" />
+			     left_delta="0" mouse_opaque="true" name="Offer Teleport..." width="145" />
       <button bottom_delta="-34" font="SansSerif" halign="center" height="20"
 			     label="Add to Friends..." label_selected="Add to Friends..." left_delta="0"
-			     mouse_opaque="true" name="Add Friend..." width="130" />
+			     mouse_opaque="true" name="Add Friend..." width="145" />
       <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
 			     label="Invite to Group..." label_selected="Invite to Group..." left_delta="0"
-			     mouse_opaque="true" name="Invite to Group..." width="130" />
+			     mouse_opaque="true" name="Invite to Group..." width="145" />
       <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Find on Map"
 			     label_selected="Find on Map" left_delta="0" mouse_opaque="true"
-			     name="Find on Map" width="130" />
+			     name="Find on Map" width="145" />
       <button bottom_delta="-34" font="SansSerif" halign="center" height="20" label="Pay..."
 			     label_selected="Pay..." left_delta="0" mouse_opaque="true" name="Pay..."
-			     width="130" />
+			     width="145" />
       <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Mute"
 			     label_selected="Mute" left_delta="0" mouse_opaque="true" name="Mute"
-			     width="130" />
+			     width="145" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-29" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
-			     mouse_opaque="true" name="label" v_pad="0" width="130">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
+			     mouse_opaque="true" name="label" v_pad="0" width="145">
         Born:
       </text>
       <line_editor bevel_style="in" border_style="line"
 			     border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-			     font="SansSerifSmall" height="18" is_unicode="false" right="-15"
+			     font="SansSerifSmall" height="18" is_unicode="false" right="-12"
 			     max_length="254" mouse_opaque="false" name="born"
-			     width="130" />
+			     width="145" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
-			     mouse_opaque="true" name="label2" v_pad="0" width="130">
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
+			     mouse_opaque="true" name="label2" v_pad="0" width="345">
         Account:
       </text>
-      <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="50" right="-15"
-			     mouse_opaque="false" name="acct_border" width="130" />
+      <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="50" right="-12"
+			     mouse_opaque="false" name="acct_border" width="145" />
       <text bg_visible="false" border_drop_shadow_visible="false"
 			     border_visible="true" bottom_delta="0" drop_shadow_visible="true"
-			     follows="left|top" font="SansSerifSmall" height="48" left="279"
+			     follows="left|top" font="SansSerifSmall" height="48" left="264"
 			     mouse_opaque="false" name="acct" width="121" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
 			     mouse_opaque="true" name="partner_label"
 			     tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-			     v_pad="0" width="130">
+			     v_pad="0" width="145">
         Partner:
       </text>
       <button bottom_delta="1" follows="left|top" font="SansSerif" halign="center"
@@ -110,20 +110,20 @@
 			     mouse_opaque="true" name="partner_help" width="20" />
       <line_editor bevel_style="in" border_style="line"
 			     border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top"
-			     font="SansSerifSmall" height="18" is_unicode="false" right="-15"
+			     font="SansSerifSmall" height="18" is_unicode="false" right="-12"
 			     max_length="254" mouse_opaque="false" name="partner_edit"
 			     tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-			     width="130">
+			     width="145">
         [FIRST] [LAST]
       </line_editor>
       <name_editor bevel_style="in" border_style="line"
 			     border_thickness="1" bottom="-23" enabled="false" follows="left|top"
-			     font="SansSerifSmall" height="16" is_unicode="false" left="20"
+			     font="SansSerifSmall" height="16" is_unicode="false" left="12"
 			     max_length="254" mouse_opaque="false" name="name"
 			     width="235" />
       <texture_picker allow_no_texture="true" bottom="271" can_apply_immediately="false"
 			     default_image_name="None" follows="left|top" height="192" label=""
-			     left="20" mouse_opaque="true" name="img" scale_image="false" auto-resize="false"
+			     left="12" mouse_opaque="true" name="img" scale_image="false" auto-resize="false"
 			     tool_tip="Click to choose a picture" width="235" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-6" drop_shadow_visible="true" follows="left|top"
@@ -138,21 +138,21 @@
 
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" halign="left" height="16" left="20"
+			     font="SansSerifSmall" halign="left" height="16" left="12"
 			     mouse_opaque="true" name="Groups:" width="70">
         Groups:
       </text>
       <scroll_list background_visible="true" bottom_delta="-80" column_padding="5" draw_border="true"
 			     follows="left|top" height="80" left_delta="0" mouse_opaque="false"
 			     multi_select="false" name="groups" width="235" />
-      <view_border blevel_style="in" bottom_delta="0" follows="left|top" height="80" right="-15"
-			     mouse_opaque="false" name="drop_target_rect_vis" width="130" />
+      <view_border blevel_style="in" bottom_delta="0" follows="left|top" height="80" right="-12"
+			     mouse_opaque="false" name="drop_target_rect_vis" width="145" />
       <view_border blevel_style="in" border_thickness="0" bottom_delta="0" follows="left|top"
 			     height="80" left_delta="0" mouse_opaque="false" name="drop_target_rect"
-			     width="130" />
+			     width="145" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="40" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16" right="-22"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16" right="-28"
 			     mouse_opaque="true" name="drop target"
 			     tool_tip="Drop inventory items here to give them to this resident." v_pad="2"
 			     width="115">
@@ -169,7 +169,7 @@
 			     initial_value="false" label="Show profile in search" left="18" mouse_opaque="true"
 			     name="allow_publish"
 			     tool_tip="Publish extra profile information such as description and image in Search."
-			     width="130" />
+			     width="145" />
       <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="18"
 			     label="?" label_selected="?" left_delta="150" mouse_opaque="true" name="?"
 			     width="20" />
@@ -206,7 +206,7 @@
 		     label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-36" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
 			     mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
         I Want To:
       </text>
@@ -241,7 +241,7 @@
 			     width="330" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
 			     mouse_opaque="true" name="Skills:" v_pad="0" width="70">
         Skills:
       </text>
@@ -270,7 +270,7 @@
 			     width="330" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
 			     mouse_opaque="true" name="Languages:" v_pad="0" width="70">
         Languages:
       </text>
@@ -296,7 +296,7 @@
       <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
 			     label="Delete..." label_selected="Delete..." left_delta="79"
 			     mouse_opaque="true" name="Delete..." width="75" />
-      <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
+      <tab_container bottom="-411" follows="left|top" height="363" left="12" mouse_opaque="false"
 			     name="picks tab" tab_position="left" width="412" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
@@ -322,7 +322,7 @@
       <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
 			     label="Delete..." label_selected="Delete..." left_delta="79"
 			     mouse_opaque="true" name="Delete..." width="75" />
-      <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"
+      <tab_container bottom="-443" follows="left|top" height="395" left="12" mouse_opaque="false"
 			     name="classified tab" tab_position="left" width="412" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
@@ -335,17 +335,17 @@
 		     label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
       <texture_picker allow_no_texture="true" bottom="220" can_apply_immediately="false"
 			     default_image_name="None" follows="left|top" height="235" label=""
-			     left="20" mouse_opaque="true" name="img"
+			     left="12" mouse_opaque="true" name="img"
 			     tool_tip="Click to choose a picture" width="235" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-8" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="20"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
 			     mouse_opaque="true" name="Info:" v_pad="0" width="161">
         Info (250 chars):
       </text>
       <text_editor bottom_delta="-179" embedded_items="false"
 			     enabled="true" follows="left|top" font="SansSerifSmall" height="178"
-			     is_unicode="false" left="20" max_length="254" mouse_opaque="false"
+			     is_unicode="false" left="12" max_length="254" mouse_opaque="false"
 			     name="about" width="378" word_wrap="true" />
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
@@ -373,7 +373,7 @@
 	     label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
 	     width="100" />
   <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Kick"
-	     label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
+	     label_selected="Kick" left="12" mouse_opaque="true" name="Kick" width="72" />
   <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Freeze"
 	     label_selected="Freeze" left_delta="76" mouse_opaque="true" name="Freeze"
 	     tool_tip="Stop this resident&apos;s movement and chat." width="72" />
-- 
cgit v1.1