Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.

svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8

1 files changed, 4 insertions, 5 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 9e95411929..cd46ccb0bc 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- bg_alpha_color="0.3 0.3 0.3 1"
  follows="left|top|right|bottom"
  height="660"
  label="Me"
@@ -9,7 +8,7 @@
  left="0"
  name="panel_target_profile"
  top="0"
- width="355">
+ width="305">
     <button 
      layout="topleft" 
      name="back" 
@@ -26,13 +25,13 @@
      layout="topleft" 
      top="0" 
      left_pad="15" 
-     width="320" 
+     width="125" 
      height="20" 
      font="SansSerifHugeBold" 
      text_color="white" 
      follows="top|left|right"
      mouse_opaque="true" 
-     name="user_name">(Loading...)</text> 
+     name="user_name">(Loading...)</text>
     <tab_container
      follows="left|top|right|bottom"
      height="625"
@@ -41,7 +40,7 @@
      name="tabs"
      tab_position="top"
      top="35"
-     width="355">
+     width="280">
         <panel
          class="panel_profile"
          filename="panel_profile.xml"