From cae0d29bd0c57722e1108a5a83456fb0767211e6 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Fri, 25 Feb 2011 06:01:18 +1000
Subject: In the meta grid, staff members have the last name "Meta", the users
 are "metazens", and we abuse the age verification flag to let people choose
 to see Adult stuff.

---
 linden/indra/newview/llmutelist.cpp                           | 2 +-
 linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 76f966e..a59f410 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -294,7 +294,7 @@ BOOL LLMuteList::isGod(const std::string& name) const
 	if (token_iter == tokens.end()) return FALSE;
 	
 	std::string last_name = *token_iter;
-	return last_name == "Linden";
+	return last_name == "Meta";
 }
 
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 2db2595..986fca1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -10,7 +10,7 @@
 [AGEVERIFICATION]
       </string>
       <string name="AcctTypeResident">
-        Resident
+        Metazen
       </string>
       <string name="AcctTypeTrial">
         Trial
@@ -19,7 +19,7 @@
         Charter Member
       </string>
       <string name="AcctTypeEmployee">
-        Linden Lab Employee
+        Meta7 Employee
       </string>
       <string name="PaymentInfoUsed">
         Payment Info Used
@@ -31,10 +31,10 @@
         No Payment Info On File
       </string>
       <string name="AgeVerified">
-        Age-verified
+        Adult
       </string>
       <string name="NotAgeVerified">
-        Not Age-verified
+        Mature
       </string>
       <string name="copy_key_info">
         Copied key for [AVATAR] to clipboard: [KEY]
-- 
cgit v1.1