From 9a6dc8ba8c46754423fc83c32b40fc40edfec72b Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Wed, 26 Oct 2011 12:26:09 -0500
Subject: [PATCH] Show Firestorm Developer and/or Support in profile displays,
 as appropriate.

---
 indra/newview/llpanelavatar.cpp               | 30 ++++++++++++++++++-
 .../xui/en/panel_profile_secondlife.xml       | 11 +++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index a9031716f8..409698c621 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -50,6 +50,7 @@
 #include "lltrans.h"
 #include "llgroupactions.h"
 #include "llgrouplist.h"
+#include "fsdata.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLDropTarget
@@ -741,7 +742,34 @@ void LLPanelAvatarProfile::fillAccountStatus(const LLAvatarData* avatar_data)
 	args["[PAYMENTINFO]"] = LLAvatarPropertiesProcessor::paymentInfo(avatar_data);
 	// *NOTE: AVATAR_AGEVERIFIED not currently getting set in 
 	// dataserver/lldataavatar.cpp for privacy considerations
-	args["[AGEVERIFICATION]"] = "";
+	//...so why didn't they comment this out too and take it out of
+	//   the XML, too? Argh. -- TS
+	// args["[AGEVERIFICATION]"] = "";
+	args["[FIRESTORM]"] = "";
+	if (FSData::is_developer(avatar_data->avatar_id))
+	{
+		args["[FIRESTORM]"] = "Firestorm";
+		std::string dev = getString("FSDev");
+		args["[FSDEV]"] = dev;
+	}
+	else
+	{
+		args["[FSDEV]"] = "";
+	}
+	if (FSData::is_support(avatar_data->avatar_id))
+	{
+		args["[FIRESTORM]"] = "Firestorm";
+		std::string supp = getString("FSSupp");
+		if (FSData::is_developer(avatar_data->avatar_id))
+		{
+			supp = " /" + supp;
+		}
+		args["[FSSUPP]"] = supp;
+	}
+	else
+	{
+		args["[FSSUPP]"] = "";
+	}
 	std::string caption_text = getString("CaptionTextAcctInfo", args);
 	getChild<LLUICtrl>("acc_status_text")->setValue(caption_text);
 }
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 0b79661748..7dbe117d33 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -12,8 +12,10 @@
      name="CaptionTextAcctInfo">
 [ACCTTYPE]
 [PAYMENTINFO]
-[AGEVERIFICATION]
+[FIRESTORM][FSDEV][FSSUPP]
     </string>
+<!-- [AGEVERIFICATION] moved out of the above, since it's not set anyway. See
+	 LLPanelAvatarProfile::fillAccountStatus() ...TS -->
     <string
      name="payment_update_link_url">
         http://www.secondlife.com/account/billing.php?lang=en
@@ -44,7 +46,12 @@
     name="display_name_text_args">
     [DISPLAY_NAME]
   </string>
-
+  <string
+    name="FSDev"
+    value=" Developer" />
+  <string
+    name="FSSupp"
+    value=" Support" />
 
           <panel
            layout="topleft"