1 files changed, 181 insertions, 198 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 11f4857..596e39c 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3267,18 +3267,8 @@ 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") 
-        // We start locally with Imprudence in case the user has a local color they prefer.
+                && LLVOAvatar::sClientResolutionList.has(idx.asString()))
-        // This means clientside colors for Imp will always override any on the website.
-        // If you're going to add a new color, a new UUID needs to be added -- MC
-        if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
-        {
-                // defaults to LLColor4(0.79f,0.44f,0.88f)
-                avatar_name_color = gSavedSettings.getColor4("ImprudenceTagColor"); //Imprudence
-                client = "Imprudence";
-        }
-        else if (LLVOAvatar::sClientResolutionList.has("isComplete") &&
-                         LLVOAvatar::sClientResolutionList.has(idx.asString()))
        {
                LLSD cllsd = LLVOAvatar::sClientResolutionList[idx.asString()];
                client = cllsd["name"].asString();
@@ -3287,193 +3277,186 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
                avatar_name_color += colour;
                avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);
        }
-        else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") ||
+        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") ||
                        idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4"))
-        {
+                {
-                avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
+                        avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
-                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                client = "Meerkat";
+                        client = "Meerkat";
-        }
+                }else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
-        else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
+                {
-        {
+                        avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
-                avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
+                        client = "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;
-                avatar_name_color += LLColor4::green;//emerald
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                avatar_name_color += LLColor4::green;
+                        client = "Emerald";
-                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                }else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
-                client = "Emerald";
+                {
-        }
+                        avatar_name_color += LLColor4::red;//vlife jcool410
-        else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
+                        avatar_name_color = avatar_name_color * 0.5;
-        {
+                        client = "VLife";
-                avatar_name_color += LLColor4::red;//vlife jcool410
+                }else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
-                avatar_name_color = avatar_name_color * 0.5;
+                {
-                client = "VLife";
+                        avatar_name_color += LLColor4::pink;//tyk3n
-        }
+                        avatar_name_color = avatar_name_color * 0.5;
-        else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
+                        client = "tyk3n";
-        {
+                }else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") || 
-                avatar_name_color += LLColor4::pink;//tyk3n
+                        idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
-                avatar_name_color = avatar_name_color * 0.5;
+                {
-                client = "tyk3n";
+                        avatar_name_color += (LLColor4::purple);//psl
-        }
+                        avatar_name_color = avatar_name_color * 0.5;
-        else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") || 
+                        client = "PSL";
-                idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
+                }else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
-        {
+                {
-                avatar_name_color += (LLColor4::purple);//psl
+                        avatar_name_color += LLColor4::red;//lordgreg
-                avatar_name_color = avatar_name_color * 0.5;
+                        avatar_name_color += LLColor4::red;
-                client = "PSL";
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-        }
+                        client = "LGG proxy";
-        else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
+                }else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
-        {
+                {
-                avatar_name_color += LLColor4::red;//lordgreg
+                        avatar_name_color += LLColor4::blue;//day oh
-                avatar_name_color += LLColor4::red;
+                        avatar_name_color = avatar_name_color * 0.5;
-                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        client = "Day Oh proxy";
-                client = "LGG proxy";
+                }else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") || 
-        }
+                        idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") || 
-        else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
+                        idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") ||
-        {
+                        idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))
-                avatar_name_color += LLColor4::blue;//day oh
+                {
-                avatar_name_color = avatar_name_color * 0.5;
+                        avatar_name_color += LLColor4::cyan;//cryolife
-                client = "Day Oh proxy";
+                        avatar_name_color += LLColor4::cyan;
-        }
+                        avatar_name_color = avatar_name_color * 0.5;
-        else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") || 
+                        client = "CryoLife";
-                idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") || 
+                }else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
-                idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") ||
+                {
-                idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))
+                        avatar_name_color += LLColor4::pink;//moy
-        {
+                        avatar_name_color += LLColor4::pink;//moy
-                avatar_name_color += LLColor4::cyan;//cryolife
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                avatar_name_color += LLColor4::cyan;
+                        client = "MoyMix";
-                avatar_name_color = avatar_name_color * 0.5;
+                }else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") ||
-                client = "CryoLife";
+                        idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))
-        }
+                {
-        else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
+                        avatar_name_color += LLColor4::yellow;//neil
-        {
+                        avatar_name_color += LLColor4::yellow;//neil
-                avatar_name_color += LLColor4::pink;//moy
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                avatar_name_color += LLColor4::pink;//moy
+                        client = "NeilLife";
-                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                }else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
-                client = "MoyMix";
+                {
-        }
+                        avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
-        else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") ||
+                        avatar_name_color = avatar_name_color * 0.5;//phox
-                idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))
+                        client = "PhoxSL";
-        {
+                }else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))
-                avatar_name_color += LLColor4::yellow;//neil
+                {
-                avatar_name_color += LLColor4::yellow;//neil
+                        avatar_name_color += LLColor4::white;
-                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        avatar_name_color += LLColor4::white;
-                client = "NeilLife";
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-        }
+                        client = "Kung Fu";
-        else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
+                }else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
-        {
+                {
-                avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
+                        avatar_name_color += LLColor4::magenta;
-                avatar_name_color = avatar_name_color * 0.5;//phox
+                        avatar_name_color += LLColor4::magenta;
-                client = "PhoxSL";
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-        }
+                        client = "BetaLife";
-        else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))
+                }else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
-        {
+                {
-                avatar_name_color += LLColor4::white;
+                        avatar_name_color += LLColor4::green;//SimFed Poland
-                avatar_name_color += LLColor4::white;
+                        avatar_name_color += LLColor4::blue;//SimFed Poland
-                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        avatar_name_color += LLColor4::blue;//SimFed Poland
-                client = "Kung Fu";
+                        avatar_name_color = avatar_name_color * 0.5;
-        }
+                        client = "Copybotter";
-        else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
+                }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
-        {
+                        idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
-                avatar_name_color += LLColor4::magenta;
+                        idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
-                avatar_name_color += LLColor4::magenta;
+                        idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
-                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-
-                client = "BetaLife";
+                {
-        }
+                        avatar_name_color += LLColor4(0.0f,0.5f,1.0f); 
-        else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
+                        avatar_name_color = avatar_name_color * 0.5;   
-        {
+                        client = "VerticalLife";
-                avatar_name_color += LLColor4::green;//SimFed Poland
+                }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
-                avatar_name_color += LLColor4::blue;//SimFed Poland
+                {
-                avatar_name_color += LLColor4::blue;//SimFed Poland
+                        avatar_name_color += LLColor4::blue; //Sapphire
-                avatar_name_color = avatar_name_color * 0.5;
+                        avatar_name_color += LLColor4::blue; //Sapphire
-                client = "Copybotter";
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-        }
+                        client = "Sapphire";
-        else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
+                }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
-                idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
+                {
-                idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
+                        avatar_name_color += LLColor4::orange; //corgiVision
-                idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
+                        avatar_name_color = avatar_name_color * (F32)0.75;
-                idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-
+                        client = "Corgi";
-        {
+                }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
-                avatar_name_color += LLColor4(0.0f,0.5f,1.0f); 
+                {
-                avatar_name_color = avatar_name_color * 0.5;   
+                        avatar_name_color += LLColor4::red; //Ruby
-                client = "VerticalLife";
+                        avatar_name_color += LLColor4::purple; //Ruby
-        }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
+                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-        {
+                        client = "Ruby";
-                avatar_name_color += LLColor4::blue; //Sapphire
+                }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
-                avatar_name_color += LLColor4::blue; //Sapphire
+                {
-                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                        avatar_name_color += LLColor4::yellow9;
-                client = "Sapphire";
+                        avatar_name_color += LLColor4::yellow9;
-        }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
+                        avatar_name_color *= (F32)0.333333333333;
-        {
+                        client = "Gemini";
-                avatar_name_color += LLColor4::orange; //corgiVision
+                }
-                avatar_name_color = avatar_name_color * (F32)0.75;
+                else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))
-                client = "Corgi";
+                {
-        }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
+                        avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
-        {
+                        client = "Operator";
-                avatar_name_color += LLColor4::red; //Ruby
+                }
-                avatar_name_color += LLColor4::purple; //Ruby
+                else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))
-                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                {
-                client = "Ruby";
+                        avatar_name_color = LLColor4(2.0f,2.0f,2.0f);
-        }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
+                        avatar_name_color *= 0.33f;
-        {
+                        client = "iLife";
-                avatar_name_color += LLColor4::yellow9;
+                }
-                avatar_name_color += LLColor4::yellow9;
+                else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))
-                avatar_name_color *= (F32)0.333333333333;
+                {
-                client = "Gemini";
+                        avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
-        }
+                        client = "Gemini.Bot";
-        else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))
+                }
-        {
+                else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))
-                avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+                {
-                client = "Operator";
+                        avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
-        }
+                        client = "Infinity";
-        else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))
+                }
-        {
+                else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))
-                avatar_name_color = LLColor4(2.0f,2.0f,2.0f);
+                {
-                avatar_name_color *= 0.33f;
+                        avatar_name_color = LLColor4(0.0f,0.6f,0.0f);
-                client = "iLife";
+                        avatar_name_color *= 0.33f;
-        }
+                        client = "rivlife";
-        else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))
+                }
-        {
+                else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))
-                avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+                {
-                client = "Gemini.Bot";
+                        avatar_name_color = LLColor4(0.69f,0.8f,1.6f);
-        }
+                        avatar_name_color *= 0.5f;
-        else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))
+                        client = "Anti-Life";
-        {
+                }
-                avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+                else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") ||
-                client = "Infinity";
+                        idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc"))
-        }
+                {
-        else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))
+                        avatar_name_color = LLColor4(0.4f,0.4f,0.4f);
-        {
+                        client = "Onyx";
-                avatar_name_color = LLColor4(0.0f,0.6f,0.0f);
+                }
-                avatar_name_color *= 0.33f;
+                else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc"))
-                client = "rivlife";
+                {
-        }
+                        avatar_name_color = LLColor4(1.0f,0.61176f,0.0f);
-        else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))
+                        client = "Whale";
-        {
+                }
-                avatar_name_color = LLColor4(0.69f,0.8f,1.6f);
+                else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb"))
-                avatar_name_color *= 0.5f;
+                {
-                client = "Anti-Life";
+                        avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
-        }
+                        client = "nolife";
-        else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") ||
+                }
-                idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc"))
-        {
-                avatar_name_color = LLColor4(0.4f,0.4f,0.4f);
-                client = "Onyx";
-        }
-        else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc"))
-        {
-                avatar_name_color = LLColor4(1.0f,0.61176f,0.0f);
-                client = "Whale";
-        }
-        else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb"))
-        {
-                avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
-                client = "nolife";
        }
        if(client.empty())
        {
                LLPointer<LLViewerImage> image_point = gImageList.getImage(idx, MIPMAP_YES, IMMEDIATE_NO);
@@ -3623,7 +3606,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                else
                                {
                                        // Set your own name to the Imprudence color -- MC
-                                        client_color = gSavedSettings.getColor4("ImprudenceTagColor");
+                                        client_color = LLColor4(0.79f,0.44f,0.88f);
                                }
                                static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 11f4857..596e39c 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp
@@ -3267,18 +3267,8 @@ bool LLVOAvatar::loadClientTags()
3267	void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar)	3267	void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar)
3268	{	3268	{
3269	LLUUID idx = avatar->getTE(0)->getID();	3269	LLUUID idx = avatar->getTE(0)->getID();
3270		3270	if(LLVOAvatar::sClientResolutionList.has("isComplete")
3271	// We start locally with Imprudence in case the user has a local color they prefer.	3271	&& LLVOAvatar::sClientResolutionList.has(idx.asString()))
3272	// This means clientside colors for Imp will always override any on the website.
3273	// If you're going to add a new color, a new UUID needs to be added -- MC
3274	if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
3275	{
3276	// defaults to LLColor4(0.79f,0.44f,0.88f)
3277	avatar_name_color = gSavedSettings.getColor4("ImprudenceTagColor"); //Imprudence
3278	client = "Imprudence";
3279	}
3280	else if (LLVOAvatar::sClientResolutionList.has("isComplete") &&
3281	LLVOAvatar::sClientResolutionList.has(idx.asString()))
3282	{	3272	{
3283	LLSD cllsd = LLVOAvatar::sClientResolutionList[idx.asString()];	3273	LLSD cllsd = LLVOAvatar::sClientResolutionList[idx.asString()];
3284	client = cllsd["name"].asString();	3274	client = cllsd["name"].asString();
@@ -3287,193 +3277,186 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3287	avatar_name_color += colour;	3277	avatar_name_color += colour;
3288	avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);	3278	avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);
3289	}	3279	}
3290	else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") \|\|	3280	else
		3281	{
		3282
		3283	if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
		3284	{
		3285	avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence
		3286	client = "Imprudence";
		3287
		3288	}else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") \|\|
3291	idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4"))	3289	idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4"))
3292	{	3290	{
3293	avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat	3291	avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
3294	avatar_name_color = avatar_name_color * (F32)0.333333333333;	3292	avatar_name_color = avatar_name_color * (F32)0.333333333333;
3295	client = "Meerkat";	3293	client = "Meerkat";
3296	}	3294	}else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
3297	else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))	3295	{
3298	{	3296	avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
3299	avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7	3297	client = "Meta7";
3300	client = "Meta7";	3298	}else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
3301	}	3299	{
3302	else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))	3300	avatar_name_color += LLColor4::green;//emerald
3303	{	3301	avatar_name_color += LLColor4::green;
3304	avatar_name_color += LLColor4::green;//emerald	3302	avatar_name_color = avatar_name_color * (F32)0.333333333333;
3305	avatar_name_color += LLColor4::green;	3303	client = "Emerald";
3306	avatar_name_color = avatar_name_color * (F32)0.333333333333;	3304	}else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
3307	client = "Emerald";	3305	{
3308	}	3306	avatar_name_color += LLColor4::red;//vlife jcool410
3309	else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))	3307	avatar_name_color = avatar_name_color * 0.5;
3310	{	3308	client = "VLife";
3311	avatar_name_color += LLColor4::red;//vlife jcool410	3309	}else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
3312	avatar_name_color = avatar_name_color * 0.5;	3310	{
3313	client = "VLife";	3311	avatar_name_color += LLColor4::pink;//tyk3n
3314	}	3312	avatar_name_color = avatar_name_color * 0.5;
3315	else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))	3313	client = "tyk3n";
3316	{	3314	}else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") \|\|
3317	avatar_name_color += LLColor4::pink;//tyk3n	3315	idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
3318	avatar_name_color = avatar_name_color * 0.5;	3316	{
3319	client = "tyk3n";	3317	avatar_name_color += (LLColor4::purple);//psl
3320	}	3318	avatar_name_color = avatar_name_color * 0.5;
3321	else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") \|\|	3319	client = "PSL";
3322	idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))	3320	}else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
3323	{	3321	{
3324	avatar_name_color += (LLColor4::purple);//psl	3322	avatar_name_color += LLColor4::red;//lordgreg
3325	avatar_name_color = avatar_name_color * 0.5;	3323	avatar_name_color += LLColor4::red;
3326	client = "PSL";	3324	avatar_name_color = avatar_name_color * (F32)0.333333333333;
3327	}	3325	client = "LGG proxy";
3328	else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))	3326	}else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
3329	{	3327	{
3330	avatar_name_color += LLColor4::red;//lordgreg	3328	avatar_name_color += LLColor4::blue;//day oh
3331	avatar_name_color += LLColor4::red;	3329	avatar_name_color = avatar_name_color * 0.5;
3332	avatar_name_color = avatar_name_color * (F32)0.333333333333;	3330	client = "Day Oh proxy";
3333	client = "LGG proxy";	3331	}else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") \|\|
3334	}	3332	idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") \|\|
3335	else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))	3333	idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") \|\|
3336	{	3334	idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))
3337	avatar_name_color += LLColor4::blue;//day oh	3335	{
3338	avatar_name_color = avatar_name_color * 0.5;	3336	avatar_name_color += LLColor4::cyan;//cryolife
3339	client = "Day Oh proxy";	3337	avatar_name_color += LLColor4::cyan;
3340	}	3338	avatar_name_color = avatar_name_color * 0.5;
3341	else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") \|\|	3339	client = "CryoLife";
3342	idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") \|\|	3340	}else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
3343	idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") \|\|	3341	{
3344	idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))	3342	avatar_name_color += LLColor4::pink;//moy
3345	{	3343	avatar_name_color += LLColor4::pink;//moy
3346	avatar_name_color += LLColor4::cyan;//cryolife	3344	avatar_name_color = avatar_name_color * (F32)0.333333333333;
3347	avatar_name_color += LLColor4::cyan;	3345	client = "MoyMix";
3348	avatar_name_color = avatar_name_color * 0.5;	3346	}else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") \|\|
3349	client = "CryoLife";	3347	idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))
3350	}	3348	{
3351	else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))	3349	avatar_name_color += LLColor4::yellow;//neil
3352	{	3350	avatar_name_color += LLColor4::yellow;//neil
3353	avatar_name_color += LLColor4::pink;//moy	3351	avatar_name_color = avatar_name_color * (F32)0.333333333333;
3354	avatar_name_color += LLColor4::pink;//moy	3352	client = "NeilLife";
3355	avatar_name_color = avatar_name_color * (F32)0.333333333333;	3353	}else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
3356	client = "MoyMix";	3354	{
3357	}	3355	avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
3358	else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") \|\|	3356	avatar_name_color = avatar_name_color * 0.5;//phox
3359	idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))	3357	client = "PhoxSL";
3360	{	3358	}else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))
3361	avatar_name_color += LLColor4::yellow;//neil	3359	{
3362	avatar_name_color += LLColor4::yellow;//neil	3360	avatar_name_color += LLColor4::white;
3363	avatar_name_color = avatar_name_color * (F32)0.333333333333;	3361	avatar_name_color += LLColor4::white;
3364	client = "NeilLife";	3362	avatar_name_color = avatar_name_color * (F32)0.333333333333;
3365	}	3363	client = "Kung Fu";
3366	else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))	3364	}else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
3367	{	3365	{
3368	avatar_name_color += LLColor4(0.0f,1.0f,1.0f);	3366	avatar_name_color += LLColor4::magenta;
3369	avatar_name_color = avatar_name_color * 0.5;//phox	3367	avatar_name_color += LLColor4::magenta;
3370	client = "PhoxSL";	3368	avatar_name_color = avatar_name_color * (F32)0.333333333333;
3371	}	3369	client = "BetaLife";
3372	else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))	3370	}else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
3373	{	3371	{
3374	avatar_name_color += LLColor4::white;	3372	avatar_name_color += LLColor4::green;//SimFed Poland
3375	avatar_name_color += LLColor4::white;	3373	avatar_name_color += LLColor4::blue;//SimFed Poland
3376	avatar_name_color = avatar_name_color * (F32)0.333333333333;	3374	avatar_name_color += LLColor4::blue;//SimFed Poland
3377	client = "Kung Fu";	3375	avatar_name_color = avatar_name_color * 0.5;
3378	}	3376	client = "Copybotter";
3379	else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))	3377	}else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") \|\| //wat
3380	{	3378	idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") \|\|//wat.
3381	avatar_name_color += LLColor4::magenta;	3379	idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") \|\|//wat.
3382	avatar_name_color += LLColor4::magenta;	3380	idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") \|\|//wat
3383	avatar_name_color = avatar_name_color * (F32)0.333333333333;	3381	idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-
3384	client = "BetaLife";	3382	{
3385	}	3383	avatar_name_color += LLColor4(0.0f,0.5f,1.0f);
3386	else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))	3384	avatar_name_color = avatar_name_color * 0.5;
3387	{	3385	client = "VerticalLife";
3388	avatar_name_color += LLColor4::green;//SimFed Poland	3386	}else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
3389	avatar_name_color += LLColor4::blue;//SimFed Poland	3387	{
3390	avatar_name_color += LLColor4::blue;//SimFed Poland	3388	avatar_name_color += LLColor4::blue; //Sapphire
3391	avatar_name_color = avatar_name_color * 0.5;	3389	avatar_name_color += LLColor4::blue; //Sapphire
3392	client = "Copybotter";	3390	avatar_name_color = avatar_name_color * (F32)0.333333333333;
3393	}	3391	client = "Sapphire";
3394	else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") \|\| //wat	3392	}else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
3395	idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") \|\|//wat.	3393	{
3396	idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") \|\|//wat.	3394	avatar_name_color += LLColor4::orange; //corgiVision
3397	idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") \|\|//wat	3395	avatar_name_color = avatar_name_color * (F32)0.75;
3398	idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-	3396	client = "Corgi";
3399	{	3397	}else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
3400	avatar_name_color += LLColor4(0.0f,0.5f,1.0f);	3398	{
3401	avatar_name_color = avatar_name_color * 0.5;	3399	avatar_name_color += LLColor4::red; //Ruby
3402	client = "VerticalLife";	3400	avatar_name_color += LLColor4::purple; //Ruby
3403	}else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))	3401	avatar_name_color = avatar_name_color * (F32)0.333333333333;
3404	{	3402	client = "Ruby";
3405	avatar_name_color += LLColor4::blue; //Sapphire	3403	}else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
3406	avatar_name_color += LLColor4::blue; //Sapphire	3404	{
3407	avatar_name_color = avatar_name_color * (F32)0.333333333333;	3405	avatar_name_color += LLColor4::yellow9;
3408	client = "Sapphire";	3406	avatar_name_color += LLColor4::yellow9;
3409	}else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))	3407	avatar_name_color *= (F32)0.333333333333;
3410	{	3408	client = "Gemini";
3411	avatar_name_color += LLColor4::orange; //corgiVision	3409	}
3412	avatar_name_color = avatar_name_color * (F32)0.75;	3410	else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))
3413	client = "Corgi";	3411	{
3414	}else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))	3412	avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3415	{	3413	client = "Operator";
3416	avatar_name_color += LLColor4::red; //Ruby	3414	}
3417	avatar_name_color += LLColor4::purple; //Ruby	3415	else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))
3418	avatar_name_color = avatar_name_color * (F32)0.333333333333;	3416	{
3419	client = "Ruby";	3417	avatar_name_color = LLColor4(2.0f,2.0f,2.0f);
3420	}else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))	3418	avatar_name_color *= 0.33f;
3421	{	3419	client = "iLife";
3422	avatar_name_color += LLColor4::yellow9;	3420	}
3423	avatar_name_color += LLColor4::yellow9;	3421	else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))
3424	avatar_name_color *= (F32)0.333333333333;	3422	{
3425	client = "Gemini";	3423	avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3426	}	3424	client = "Gemini.Bot";
3427	else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))	3425	}
3428	{	3426	else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))
3429	avatar_name_color = LLColor4(1.0f,1.0f,1.0f);	3427	{
3430	client = "Operator";	3428	avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3431	}	3429	client = "Infinity";
3432	else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))	3430	}
3433	{	3431	else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))
3434	avatar_name_color = LLColor4(2.0f,2.0f,2.0f);	3432	{
3435	avatar_name_color *= 0.33f;	3433	avatar_name_color = LLColor4(0.0f,0.6f,0.0f);
3436	client = "iLife";	3434	avatar_name_color *= 0.33f;
3437	}	3435	client = "rivlife";
3438	else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))	3436	}
3439	{	3437	else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))
3440	avatar_name_color = LLColor4(1.0f,1.0f,1.0f);	3438	{
3441	client = "Gemini.Bot";	3439	avatar_name_color = LLColor4(0.69f,0.8f,1.6f);
3442	}	3440	avatar_name_color *= 0.5f;
3443	else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))	3441	client = "Anti-Life";
3444	{	3442	}
3445	avatar_name_color = LLColor4(1.0f,1.0f,1.0f);	3443	else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") \|\|
3446	client = "Infinity";	3444	idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc"))
3447	}	3445	{
3448	else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))	3446	avatar_name_color = LLColor4(0.4f,0.4f,0.4f);
3449	{	3447	client = "Onyx";
3450	avatar_name_color = LLColor4(0.0f,0.6f,0.0f);	3448	}
3451	avatar_name_color *= 0.33f;	3449	else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc"))
3452	client = "rivlife";	3450	{
3453	}	3451	avatar_name_color = LLColor4(1.0f,0.61176f,0.0f);
3454	else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))	3452	client = "Whale";
3455	{	3453	}
3456	avatar_name_color = LLColor4(0.69f,0.8f,1.6f);	3454	else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb"))
3457	avatar_name_color *= 0.5f;	3455	{
3458	client = "Anti-Life";	3456	avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3459	}	3457	client = "nolife";
3460	else if(idx == LLUUID("f5feab57-bde5-2074-97af-517290213eaa") \|\|	3458	}
3461	idx == LLUUID("e6f9c019-8783-dc3e-b265-41f1510333fc"))
3462	{
3463	avatar_name_color = LLColor4(0.4f,0.4f,0.4f);
3464	client = "Onyx";
3465	}
3466	else if(idx == LLUUID("c58fca06-33b3-827d-d81c-a886a631affc"))
3467	{
3468	avatar_name_color = LLColor4(1.0f,0.61176f,0.0f);
3469	client = "Whale";
3470	}
3471	else if(idx == LLUUID("9ba526b6-f43d-6b60-42de-ce62a25ee7fb"))
3472	{
3473	avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
3474	client = "nolife";
3475	}	3459	}
3476
3477	if(client.empty())	3460	if(client.empty())
3478	{	3461	{
3479	LLPointer<LLViewerImage> image_point = gImageList.getImage(idx, MIPMAP_YES, IMMEDIATE_NO);	3462	LLPointer<LLViewerImage> image_point = gImageList.getImage(idx, MIPMAP_YES, IMMEDIATE_NO);
@@ -3623,7 +3606,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
3623	else	3606	else
3624	{	3607	{
3625	// Set your own name to the Imprudence color -- MC	3608	// Set your own name to the Imprudence color -- MC
3626	client_color = gSavedSettings.getColor4("ImprudenceTagColor");	3609	client_color = LLColor4(0.79f,0.44f,0.88f);
3627	}	3610	}
3628		3611
3629	static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);	3612	static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);