SL-19636 Profile badges

8 files changed, 60 insertions, 4 deletions

diff --git a/indra/newview/skins/default/textures/icons/profile_badge_beta.png b/indra/newview/skins/default/textures/icons/profile_badge_beta.png
new file mode 100644
index 0000000000..7c8a723c47
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/profile_badge_beta.png
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_beta_lifetime.png b/indra/newview/skins/default/textures/icons/profile_badge_beta_lifetime.png
new file mode 100644
index 0000000000..7c38e9e2ae
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/profile_badge_beta_lifetime.png
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_lifetime.png b/indra/newview/skins/default/textures/icons/profile_badge_lifetime.png
new file mode 100644
index 0000000000..475edd080e
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/profile_badge_lifetime.png
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_linden.png b/indra/newview/skins/default/textures/icons/profile_badge_linden.png
new file mode 100644
index 0000000000..1b6ac03e86
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/profile_badge_linden.png
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_pplus_lifetime.png b/indra/newview/skins/default/textures/icons/profile_badge_pplus_lifetime.png
new file mode 100644
index 0000000000..4286995202
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/profile_badge_pplus_lifetime.png
diff --git a/indra/newview/skins/default/textures/icons/profile_badge_premium_lifetime.png b/indra/newview/skins/default/textures/icons/profile_badge_premium_lifetime.png
new file mode 100644
index 0000000000..47e93c4fac
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/profile_badge_premium_lifetime.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1f2c0867c4..03fc00b8f9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -510,7 +510,13 @@ with the same filename but different name
   <texture name="Play_Off" file_name="icons/Play_Off.png" preload="false" />
   <texture name="Play_Over" file_name="icons/Play_Over.png" preload="false" />
   <texture name="Play_Press" file_name="icons/Play_Press.png" preload="false" />
-  
+
+  <texture name="Profile_Badge_Beta" file_name="icons/profile_badge_beta.png" preload="true"/>
+  <texture name="Profile_Badge_Beta_Lifetime" file_name="icons/profile_badge_beta_lifetime.png" preload="true"/>
+  <texture name="Profile_Badge_Lifetime" file_name="icons/profile_badge_lifetime.png" preload="true"/>
+  <texture name="Profile_Badge_Linden" file_name="icons/profile_badge_linden.png" preload="true"/>
+  <texture name="Profile_Badge_Pplus_Lifetime" file_name="icons/profile_badge_pplus_lifetime.png" preload="true"/>
+  <texture name="Profile_Badge_Premium_Lifetime" file_name="icons/profile_badge_premium_lifetime.png" preload="true"/>
   <texture name="Profile_Group_Visibility_Off" file_name="icons/profile_group_visibility_eye_off.png" preload="true"/>
   <texture name="Profile_Group_Visibility_Off_Pressed" file_name="icons/profile_group_visibility_eye_off_pressed.png" preload="true"/>
   <texture name="Profile_Group_Visibility_On" file_name="icons/profile_group_visibility_eye_on.png" preload="true"/>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 777b37d666..07cdd6d71e 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -27,6 +27,26 @@
 Account: [ACCTTYPE]
 [PAYMENTINFO]
     </string>
+    
+    <!--Badges-->
+    <string
+     name="BadgeBeta"
+     value="Original Beta Tester" />
+    <string
+     name="BadgeBetaLifetime"
+     value="Beta Lifetime member" />
+    <string
+     name="BadgeLifetime"
+     value="Lifetime member" />
+    <string
+     name="BadgeLinden"
+     value="Linden Lab employee" />
+    <string
+     name="BadgePremiumLifetime"
+     value="Premium lifetime" />
+    <string
+     name="BadgePremiumPlusLifetime"
+     value="Premium Plus lifetime" />
 
   <layout_stack
    name="image_stack"
@@ -156,9 +176,39 @@ Account: [ACCTTYPE]
      user_resize="false"
      visible="true">
     </layout_panel>
-    
+
+    <layout_panel
+     name="badge_layout"
+     follows="all"
+     layout="topleft"
+     height="40"
+     auto_resize="false"
+     user_resize="false"
+     visible="false">
+      <icon
+       name="badge_icon"
+       image_name="Beta_Tester"
+       layout="topleft"
+       follows="left|top"
+       top="10"
+       left="5"
+       height="18"
+       width="18"/>
+      <text
+       name="badge_text"
+       value="Badge Tester"
+       top="13"
+       left_pad="3"
+       right="-1"
+       height="16"
+       follows="left|top|right"
+       layout="topleft"
+       translate="false"
+       visible="true"/>
+    </layout_panel>
+
     <layout_panel
-     name="frind_layout"
+     name="friend_layout"
      follows="all"
      layout="topleft"
      height="16"
@@ -166,7 +216,7 @@ Account: [ACCTTYPE]
      user_resize="false"
      visible="false">
       <text
-       name="frind_text"
+       name="friend_text"
        value="You are friends"
        text_color="ConversationFriendColor"
        top="0"