aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvoavatar.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d1871b7..3f378d4 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3268,6 +3268,8 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3268{ 3268{
3269 LLUUID idx = avatar->getTE(0)->getID(); 3269 LLUUID idx = avatar->getTE(0)->getID();
3270 3270
3271 // If you're going to add a new color, a new UUID needs to be added -- MC
3272
3271 // meta-impy gets special treatment - 3273 // meta-impy gets special treatment -
3272 // A) coz this is our damn viewer. 3274 // A) coz this is our damn viewer.
3273 // 2) makes it quicker coz everyone else around you is using it. 3275 // 2) makes it quicker coz everyone else around you is using it.
@@ -3278,7 +3280,6 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3278 client = "meta-impy"; 3280 client = "meta-impy";
3279 } 3281 }
3280 // Imprudence is special to, coz dark blue on black is just unreadable. Pffft. 3282 // Imprudence is special to, coz dark blue on black is just unreadable. Pffft.
3281 // If you're going to add a new color, a new UUID needs to be added -- MC
3282 else if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf")) 3283 else if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
3283 { 3284 {
3284 avatar_name_color = LLColor4(0.79f,0.44f,0.88f);// Imprudence 3285 avatar_name_color = LLColor4(0.79f,0.44f,0.88f);// Imprudence
@@ -3474,6 +3475,7 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3474 } 3475 }
3475 } 3476 }
3476 3477
3478
3477 if(client.empty()) 3479 if(client.empty())
3478 { 3480 {
3479 LLPointer<LLViewerImage> image_point = gImageList.getImage(idx, MIPMAP_YES, IMMEDIATE_NO); 3481 LLPointer<LLViewerImage> image_point = gImageList.getImage(idx, MIPMAP_YES, IMMEDIATE_NO);
@@ -3498,7 +3500,6 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3498 avatar_name_color += colour; 3500 avatar_name_color += colour;
3499 avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f); 3501 avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);
3500 } 3502 }
3501
3502} 3503}
3503 3504
3504void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) 3505void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)