From 7513e93d1a707c6dd1eb98ce90f9836b33a3412a Mon Sep 17 00:00:00 2001 From: siana Date: Fri, 14 Jan 2011 02:31:59 +0100 Subject: [PATCH] Minor fixes: DN, skin, icon --- indra/newview/llvoavatar.cpp | 16 +- indra/newview/res/snowglobe_icon.ico | Bin 9662 -> 2238 bytes indra/newview/skins/dark/colors_base.xml | 413 +++++++++++------------ 3 files changed, 218 insertions(+), 211 deletions(-) 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 87475ae0a019e06aef79ab589339b6fa902eadea..65b6e4abff0f11fa51b4b298bb185f6dbd14f852 100644 GIT binary patch literal 2238 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 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +