summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-11-06 15:44:43 -0500
committerJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-11-06 15:44:43 -0500
commitc9b03c56afdaf9286745a8a50e0af0b9881ad2fb (patch)
tree9648c6bfbc206daa2f8bc9a08ff6cf3c42942f26 /indra/newview
parentc189943583f13dba0b56d58e4e4adec4f7f7f650 (diff)
Updated default_profile_picture to match style. Added Blank graphic to use as overlay icon (in order to produce tool-tip). Created panel_profile_user.xml which is a profile panel specifically for the current user, and modified panel_me_profile to call it accordingly.
http://jira.secondlife.com/browse/EXT-2245
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/textures/Blank.pngbin0 -> 110 bytes
-rw-r--r--indra/newview/skins/default/textures/default_profile_picture.j2cbin6128 -> 1512 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml4
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
new file mode 100644
index 0000000000..f38e9f9100
--- /dev/null
+++ b/indra/newview/skins/default/textures/Blank.png
Binary files differ
diff --git a/indra/newview/skins/default/textures/default_profile_picture.j2c b/indra/newview/skins/default/textures/default_profile_picture.j2c
index c53a22e816..f21742cf09 100644
--- a/indra/newview/skins/default/textures/default_profile_picture.j2c
+++ b/indra/newview/skins/default/textures/default_profile_picture.j2c
Binary files differ
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"