2 files changed, 29 insertions, 15 deletions

diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp
index 0ad9f79..b402ba0 100755
--- a/linden/indra/llprimitive/llprimitive.cpp
+++ b/linden/indra/llprimitive/llprimitive.cpp
@@ -1080,7 +1080,8 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys, int shield) const
         
         S32 last_face_index = getNumTEs() - 1;
 
-        LLUUID client_tag = LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf");//Imprudence
+//        LLUUID client_tag = LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf");//Imprudence
+        LLUUID client_tag = LLUUID("f5788536-508d-4d2a-b6db-bb2b4a19f626");//meta-impy
         if (shield == 2)client_tag = LLUUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97");//IMG_DEFAULT_AVATAR
 
         if (last_face_index > -1)
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 6904bb2..de6b22d 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3229,7 +3229,29 @@ bool LLVOAvatar::loadClientTags()
 void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar)
 {
         LLUUID idx = avatar->getTE(0)->getID();
-        if(LLVOAvatar::sClientResolutionList.has("isComplete") 
+        // Meta7 gets special treatment -
+        // A) coz this is our damn viewer.
+        // 2) makes it quicker coz everyone else around you is using it.
+        // III) the client tags list out in the wild is wrong.
+        // D) Casper sucks cocks, or Casper cocks suck.  Probably both.
+        if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
+        {
+                avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
+                client = "Meta7";
+        }
+        // Imprudence is special to, coz dark purple on black is just unreadable.  Pffft.
+        else if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
+        {
+                avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence
+                client = "Imprudence";
+        }
+        // Don't think anyone allocates these tags, so grab one for us to.
+        else if(idx == LLUUID("f5788536-508d-4d2a-b6db-bb2b4a19f626"))
+        {
+                avatar_name_color = LLColor4(0.5f,0.5f,1.0f);//meta-impy
+                client = "meta-impy";
+        }
+        else if(LLVOAvatar::sClientResolutionList.has("isComplete") 
                 && LLVOAvatar::sClientResolutionList.has(idx.asString()))
         {
                 LLSD cllsd = LLVOAvatar::sClientResolutionList[idx.asString()];
@@ -3240,24 +3262,15 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
                 avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);
         }
         else
-        {       
-
-                if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
-                {
-                        avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence
-                        client = "Imprudence";
-
-                }else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") ||
+        {
+                if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") ||
                         idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4"))
                 {
                         avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
                         avatar_name_color = avatar_name_color * (F32)0.333333333333;
                         client = "Meerkat";
-                }else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
-                {
-                        avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
-                        client = "Meta7";
-                }else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
+                }
+                else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
                 {
                         avatar_name_color += LLColor4::green;//emerald
                         avatar_name_color += LLColor4::green;