aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-01 13:35:35 -0700
committerJacek Antonelli2010-06-19 02:43:27 -0500
commit6c0af93ea159f8e6f01ae8ca96c24d4dfef68f0b (patch)
tree6ebd2b8eaad0fc3eb66342d640c49c561a82542a /linden/indra
parentFixed bad indentations and tidied up some spacing in the en-us notifications.... (diff)
downloadmeta-impy-6c0af93ea159f8e6f01ae8ca96c24d4dfef68f0b.zip
meta-impy-6c0af93ea159f8e6f01ae8ca96c24d4dfef68f0b.tar.gz
meta-impy-6c0af93ea159f8e6f01ae8ca96c24d4dfef68f0b.tar.bz2
meta-impy-6c0af93ea159f8e6f01ae8ca96c24d4dfef68f0b.tar.xz
Added client identification for the Meta7 viewer
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llvoavatar.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 2a2da8d..123b3a6 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3244,11 +3244,15 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3244 avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence 3244 avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence
3245 client = "Imprudence"; 3245 client = "Imprudence";
3246 3246
3247 } else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190")) 3247 }else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190"))
3248 { 3248 {
3249 avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat 3249 avatar_name_color += LLColor4(1.0f,0.9f,0.7f);//Meerkat
3250 avatar_name_color = avatar_name_color * (F32)0.333333333333; 3250 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3251 client = "Meerkat"; 3251 client = "Meerkat";
3252 }else if(idx == LLUUID("b32f01bc-f9b3-4535-b1f3-99dc38f022db"))
3253 {
3254 avatar_name_color = LLColor4(0.8f,1.0f,0.0f,1.0f);//Meta7
3255 client = "Meta7";
3252 }else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218")) 3256 }else if(idx == LLUUID("ccda2b3b-e72c-a112-e126-fee238b67218"))
3253 { 3257 {
3254 avatar_name_color += LLColor4::green;//emerald 3258 avatar_name_color += LLColor4::green;//emerald