1 files changed, 198 insertions, 181 deletions

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 596e39c..11f4857 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3267,8 +3267,18 @@ 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") 
-                && LLVOAvatar::sClientResolutionList.has(idx.asString()))
+
+        // We start locally with Imprudence in case the user has a local color they prefer.
+        // 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();
@@ -3277,186 +3287,193 @@ 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("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") ||
+        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 = 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"))
-                {
-                        avatar_name_color += LLColor4::green;//emerald
-                        avatar_name_color += LLColor4::green;
-                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                        client = "Emerald";
-                }else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
-                {
-                        avatar_name_color += LLColor4::red;//vlife jcool410
-                        avatar_name_color = avatar_name_color * 0.5;
-                        client = "VLife";
-                }else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
-                {
-                        avatar_name_color += LLColor4::pink;//tyk3n
-                        avatar_name_color = avatar_name_color * 0.5;
-                        client = "tyk3n";
-                }else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") || 
-                        idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
-                {
-                        avatar_name_color += (LLColor4::purple);//psl
-                        avatar_name_color = avatar_name_color * 0.5;
-                        client = "PSL";
-                }else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
-                {
-                        avatar_name_color += LLColor4::red;//lordgreg
-                        avatar_name_color += LLColor4::red;
-                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                        client = "LGG proxy";
-                }else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
-                {
-                        avatar_name_color += LLColor4::blue;//day oh
-                        avatar_name_color = avatar_name_color * 0.5;
-                        client = "Day Oh proxy";
-                }else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") || 
-                        idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") || 
-                        idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") ||
-                        idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))
-                {
-                        avatar_name_color += LLColor4::cyan;//cryolife
-                        avatar_name_color += LLColor4::cyan;
-                        avatar_name_color = avatar_name_color * 0.5;
-                        client = "CryoLife";
-                }else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
-                {
-                        avatar_name_color += LLColor4::pink;//moy
-                        avatar_name_color += LLColor4::pink;//moy
-                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                        client = "MoyMix";
-                }else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") ||
-                        idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))
-                {
-                        avatar_name_color += LLColor4::yellow;//neil
-                        avatar_name_color += LLColor4::yellow;//neil
-                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                        client = "NeilLife";
-                }else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
-                {
-                        avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
-                        avatar_name_color = avatar_name_color * 0.5;//phox
-                        client = "PhoxSL";
-                }else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))
-                {
-                        avatar_name_color += LLColor4::white;
-                        avatar_name_color += LLColor4::white;
-                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                        client = "Kung Fu";
-                }else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
-                {
-                        avatar_name_color += LLColor4::magenta;
-                        avatar_name_color += LLColor4::magenta;
-                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                        client = "BetaLife";
-                }else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
-                {
-                        avatar_name_color += LLColor4::green;//SimFed Poland
-                        avatar_name_color += LLColor4::blue;//SimFed Poland
-                        avatar_name_color += LLColor4::blue;//SimFed Poland
-                        avatar_name_color = avatar_name_color * 0.5;
-                        client = "Copybotter";
-                }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
-                        idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
-                        idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
-                        idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
-                        idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-
-                {
-                        avatar_name_color += LLColor4(0.0f,0.5f,1.0f); 
-                        avatar_name_color = avatar_name_color * 0.5;   
-                        client = "VerticalLife";
-                }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
-                {
-                        avatar_name_color += LLColor4::blue; //Sapphire
-                        avatar_name_color += LLColor4::blue; //Sapphire
-                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                        client = "Sapphire";
-                }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
-                {
-                        avatar_name_color += LLColor4::orange; //corgiVision
-                        avatar_name_color = avatar_name_color * (F32)0.75;
-                        client = "Corgi";
-                }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
-                {
-                        avatar_name_color += LLColor4::red; //Ruby
-                        avatar_name_color += LLColor4::purple; //Ruby
-                        avatar_name_color = avatar_name_color * (F32)0.333333333333;
-                        client = "Ruby";
-                }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
-                {
-                        avatar_name_color += LLColor4::yellow9;
-                        avatar_name_color += LLColor4::yellow9;
-                        avatar_name_color *= (F32)0.333333333333;
-                        client = "Gemini";
-                }
-                else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))
-                {
-                        avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
-                        client = "Operator";
-                }
-                else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))
-                {
-                        avatar_name_color = LLColor4(2.0f,2.0f,2.0f);
-                        avatar_name_color *= 0.33f;
-                        client = "iLife";
-                }
-                else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))
-                {
-                        avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
-                        client = "Gemini.Bot";
-                }
-                else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))
-                {
-                        avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
-                        client = "Infinity";
-                }
-                else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))
-                {
-                        avatar_name_color = LLColor4(0.0f,0.6f,0.0f);
-                        avatar_name_color *= 0.33f;
-                        client = "rivlife";
-                }
-                else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))
-                {
-                        avatar_name_color = LLColor4(0.69f,0.8f,1.6f);
-                        avatar_name_color *= 0.5f;
-                        client = "Anti-Life";
-                }
-                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";
-                }
+        {
+                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"))
+        {
+                avatar_name_color += LLColor4::green;//emerald
+                avatar_name_color += LLColor4::green;
+                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                client = "Emerald";
         }
+        else if(idx == LLUUID("c252d89d-6f7c-7d90-f430-d140d2e3fbbe"))
+        {
+                avatar_name_color += LLColor4::red;//vlife jcool410
+                avatar_name_color = avatar_name_color * 0.5;
+                client = "VLife";
+        }
+        else if(idx == LLUUID("adcbe893-7643-fd12-f61c-0b39717e2e32"))
+        {
+                avatar_name_color += LLColor4::pink;//tyk3n
+                avatar_name_color = avatar_name_color * 0.5;
+                client = "tyk3n";
+        }
+        else if(idx == LLUUID("f3fd74a6-fee7-4b2f-93ae-ddcb5991da04") || 
+                idx == LLUUID("77662f23-c77a-9b4d-5558-26b757b2144c"))
+        {
+                avatar_name_color += (LLColor4::purple);//psl
+                avatar_name_color = avatar_name_color * 0.5;
+                client = "PSL";
+        }
+        else if(idx == LLUUID("5aa5c70d-d787-571b-0495-4fc1bdef1500"))
+        {
+                avatar_name_color += LLColor4::red;//lordgreg
+                avatar_name_color += LLColor4::red;
+                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                client = "LGG proxy";
+        }
+        else if(idx == LLUUID("8183e823-c443-2142-6eb6-2ab763d4f81c"))
+        {
+                avatar_name_color += LLColor4::blue;//day oh
+                avatar_name_color = avatar_name_color * 0.5;
+                client = "Day Oh proxy";
+        }
+        else if(idx == LLUUID("e52d21f7-3c8b-819f-a3db-65c432295dac") || 
+                idx == LLUUID("0f6723d2-5b23-6b58-08ab-308112b33786") || 
+                idx == LLUUID("7c4d47a3-0c51-04d1-fa47-e4f3ac12f59b") ||
+                idx == LLUUID("d0091f21-1eef-a4ad-b358-249a8e5432ea"))
+        {
+                avatar_name_color += LLColor4::cyan;//cryolife
+                avatar_name_color += LLColor4::cyan;
+                avatar_name_color = avatar_name_color * 0.5;
+                client = "CryoLife";
+        }
+        else if(idx == LLUUID("0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8"))
+        {
+                avatar_name_color += LLColor4::pink;//moy
+                avatar_name_color += LLColor4::pink;//moy
+                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                client = "MoyMix";
+        }
+        else if(idx == LLUUID("f5a48821-9a98-d09e-8d6a-50cc08ba9a47") ||
+                idx == LLUUID("d95e0d9a-4d40-ea1b-a054-8db87f583f58"))
+        {
+                avatar_name_color += LLColor4::yellow;//neil
+                avatar_name_color += LLColor4::yellow;//neil
+                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                client = "NeilLife";
+        }
+        else if(idx == LLUUID("2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6"))
+        {
+                avatar_name_color += LLColor4(0.0f,1.0f,1.0f);
+                avatar_name_color = avatar_name_color * 0.5;//phox
+                client = "PhoxSL";
+        }
+        else if(idx == LLUUID("c5b570ca-bb7e-3c81-afd1-f62646b20014"))
+        {
+                avatar_name_color += LLColor4::white;
+                avatar_name_color += LLColor4::white;
+                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                client = "Kung Fu";
+        }
+        else if(idx == LLUUID("9422e9d7-7b11-83e4-6262-4a8db4716a3b"))
+        {
+                avatar_name_color += LLColor4::magenta;
+                avatar_name_color += LLColor4::magenta;
+                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                client = "BetaLife";
+        }
+        else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
+        {
+                avatar_name_color += LLColor4::green;//SimFed Poland
+                avatar_name_color += LLColor4::blue;//SimFed Poland
+                avatar_name_color += LLColor4::blue;//SimFed Poland
+                avatar_name_color = avatar_name_color * 0.5;
+                client = "Copybotter";
+        }
+        else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
+                idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
+                idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
+                idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
+                idx == LLUUID("841ef25b-3b90-caf9-ea3d-5649e755db65")) //wat -.-
+        {
+                avatar_name_color += LLColor4(0.0f,0.5f,1.0f); 
+                avatar_name_color = avatar_name_color * 0.5;   
+                client = "VerticalLife";
+        }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
+        {
+                avatar_name_color += LLColor4::blue; //Sapphire
+                avatar_name_color += LLColor4::blue; //Sapphire
+                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                client = "Sapphire";
+        }else if(idx == LLUUID("ffce04ff-5303-4909-a044-d37af7ab0b0e"))
+        {
+                avatar_name_color += LLColor4::orange; //corgiVision
+                avatar_name_color = avatar_name_color * (F32)0.75;
+                client = "Corgi";
+        }else if(idx == LLUUID("ccb509cf-cc69-e569-38f1-5086c687afd1"))
+        {
+                avatar_name_color += LLColor4::red; //Ruby
+                avatar_name_color += LLColor4::purple; //Ruby
+                avatar_name_color = avatar_name_color * (F32)0.333333333333;
+                client = "Ruby";
+        }else if(idx == LLUUID("1c29480c-c608-df87-28bb-964fb64c5366"))
+        {
+                avatar_name_color += LLColor4::yellow9;
+                avatar_name_color += LLColor4::yellow9;
+                avatar_name_color *= (F32)0.333333333333;
+                client = "Gemini";
+        }
+        else if(idx == LLUUID("3da8a69a-58ca-023f-2161-57f2ab3b5702"))
+        {
+                avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+                client = "Operator";
+        }
+        else if(idx == LLUUID("4da16427-d81e-e816-f346-aaf4741b8056"))
+        {
+                avatar_name_color = LLColor4(2.0f,2.0f,2.0f);
+                avatar_name_color *= 0.33f;
+                client = "iLife";
+        }
+        else if(idx == LLUUID("5262d71a-88f7-ef40-3b15-00ea148ab4b5"))
+        {
+                avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+                client = "Gemini.Bot";
+        }
+        else if(idx == LLUUID("81b3e921-ee31-aa57-ff9b-ec1f28e41da1"))
+        {
+                avatar_name_color = LLColor4(1.0f,1.0f,1.0f);
+                client = "Infinity";
+        }
+        else if(idx == LLUUID("d3eb4a5f-aec5-4bcb-b007-cce9efe89d37"))
+        {
+                avatar_name_color = LLColor4(0.0f,0.6f,0.0f);
+                avatar_name_color *= 0.33f;
+                client = "rivlife";
+        }
+        else if(idx == LLUUID("f12457b5-762e-52a7-efad-8f17f3b022ee"))
+        {
+                avatar_name_color = LLColor4(0.69f,0.8f,1.6f);
+                avatar_name_color *= 0.5f;
+                client = "Anti-Life";
+        }
+        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);
@@ -3606,7 +3623,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 else
                                 {
                                         // Set your own name to the Imprudence color -- MC
-                                        client_color = LLColor4(0.79f,0.44f,0.88f);
+                                        client_color = gSavedSettings.getColor4("ImprudenceTagColor");
                                 }
 
                                 static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);