aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llmutelist.cpp2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml8
2 files changed, 5 insertions, 5 deletions
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
294 if (token_iter == tokens.end()) return FALSE; 294 if (token_iter == tokens.end()) return FALSE;
295 295
296 std::string last_name = *token_iter; 296 std::string last_name = *token_iter;
297 return last_name == "Linden"; 297 return last_name == "Meta";
298} 298}
299 299
300 300
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 @@
10[AGEVERIFICATION] 10[AGEVERIFICATION]
11 </string> 11 </string>
12 <string name="AcctTypeResident"> 12 <string name="AcctTypeResident">
13 Resident 13 Metazen
14 </string> 14 </string>
15 <string name="AcctTypeTrial"> 15 <string name="AcctTypeTrial">
16 Trial 16 Trial
@@ -19,7 +19,7 @@
19 Charter Member 19 Charter Member
20 </string> 20 </string>
21 <string name="AcctTypeEmployee"> 21 <string name="AcctTypeEmployee">
22 Linden Lab Employee 22 Meta7 Employee
23 </string> 23 </string>
24 <string name="PaymentInfoUsed"> 24 <string name="PaymentInfoUsed">
25 Payment Info Used 25 Payment Info Used
@@ -31,10 +31,10 @@
31 No Payment Info On File 31 No Payment Info On File
32 </string> 32 </string>
33 <string name="AgeVerified"> 33 <string name="AgeVerified">
34 Age-verified 34 Adult
35 </string> 35 </string>
36 <string name="NotAgeVerified"> 36 <string name="NotAgeVerified">
37 Not Age-verified 37 Mature
38 </string> 38 </string>
39 <string name="copy_key_info"> 39 <string name="copy_key_info">
40 Copied key for [AVATAR] to clipboard: [KEY] 40 Copied key for [AVATAR] to clipboard: [KEY]