diff options
| author | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-11-06 15:45:56 -0500 |
|---|---|---|
| committer | Justin C. Rounds (Chuck) <chuck@lindenlab.com> | 2009-11-06 15:45:56 -0500 |
| commit | 3f8172707833f30d3c39d165c975bd3d97511080 (patch) | |
| tree | 934c755f953233273f5627bc754c2f5157f5e64c /indra/newview/skins | |
| parent | 0db73b1ac58650bf681803c93767c64c3d908e15 (diff) | |
| parent | c9b03c56afdaf9286745a8a50e0af0b9881ad2fb (diff) | |
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/textures/Blank.png | bin | 0 -> 110 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/default_profile_picture.j2c | bin | 6128 -> 1512 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile.xml | 4 |
4 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/skins/default/textures/Blank.png b/indra/newview/skins/default/textures/Blank.png Binary files differnew file mode 100644 index 0000000000..f38e9f9100 --- /dev/null +++ b/indra/newview/skins/default/textures/Blank.png diff --git a/indra/newview/skins/default/textures/default_profile_picture.j2c b/indra/newview/skins/default/textures/default_profile_picture.j2c Binary files differindex c53a22e816..f21742cf09 100644 --- a/indra/newview/skins/default/textures/default_profile_picture.j2c +++ b/indra/newview/skins/default/textures/default_profile_picture.j2c diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index cf7ab46dd5..7f33330123 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -27,6 +27,8 @@ <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" /> <texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" /> + <texture name="Blank" file_name="Blank.png" preload="false" /> + <texture name="BottomTray_BG" file_name="bottomtray/BottomTray_BG.png" preload="false" /> <texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 23d55b33e2..a0055383b1 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -58,7 +58,7 @@ default_image_name="None" enabled="false" follows="top|left" - height="117" + height="102" layout="topleft" left="0" name="2nd_life_pic" @@ -102,7 +102,7 @@ default_image_name="None" enabled="false" follows="top|left" - height="117" + height="102" layout="topleft" left="0" name="real_world_pic" |
