diff options
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 7c867d2..2a2da8d 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
@@ -3486,12 +3486,19 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) | |||
3486 | } | 3486 | } |
3487 | 3487 | ||
3488 | LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" ); | 3488 | LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" ); |
3489 | if(!mIsSelf) //don't know your own client ? | 3489 | if (gSavedSettings.getBOOL("ShowClientNameTag")) |
3490 | { | 3490 | { |
3491 | new_name = TRUE; //lol or see the last client used | 3491 | if(!mIsSelf) //don't know your own client ? |
3492 | if (gSavedSettings.getBOOL("ShowClientNameTag")) | ||
3493 | { | 3492 | { |
3494 | resolveClient(avatar_name_color,client, this); | 3493 | new_name = TRUE; //lol or see the last client used |
3494 | { | ||
3495 | resolveClient(avatar_name_color,client, this); | ||
3496 | } | ||
3497 | } | ||
3498 | else | ||
3499 | { | ||
3500 | // Set your own name to the Imprudence color -- MC | ||
3501 | avatar_name_color = LLColor4(0.79f,0.44f,0.88f); | ||
3495 | } | 3502 | } |
3496 | } | 3503 | } |
3497 | avatar_name_color.setAlpha(alpha); | 3504 | avatar_name_color.setAlpha(alpha); |