diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 2fd81f4a6..b4ad4e27f 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3768,11 +3768,19 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
std::string usedname;
if(dnhasloaded && !av_name.mIsDisplayNameDefault && !av_name.mIsDummy
- && av_name.mDisplayName != av_name.getLegacyName()) usedname = av_name.mDisplayName;
- else {
+ && av_name.mDisplayName != av_name.getLegacyName())
+ {
+ usedname = av_name.mDisplayName;
+ }
+ else
+ {
usedname = firstname->getString();
- usedname += " ";
- usedname += lastname->getString();
+ std::string ln = lastname->getString();
+ if(ln != "Resident")
+ {
+ usedname += " ";
+ usedname += ln;
+ }
dnhasloaded=false;
useddn=false;
}
diff --git a/indra/newview/res/snowglobe_icon.ico b/indra/newview/res/snowglobe_icon.ico
index 87475ae0a..65b6e4abf 100644
Binary files a/indra/newview/res/snowglobe_icon.ico and b/indra/newview/res/snowglobe_icon.ico differ
diff --git a/indra/newview/skins/dark/colors_base.xml b/indra/newview/skins/dark/colors_base.xml
index dee68bf9f..52ca9f1af 100644
--- a/indra/newview/skins/dark/colors_base.xml
+++ b/indra/newview/skins/dark/colors_base.xml
@@ -1,207 +1,206 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+