aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorArmin Weatherwax2010-01-01 14:26:23 +0100
committerMcCabe Maxsted2010-01-01 23:13:24 -0700
commit7685169524bf34061ce1631cab60dc170ab78b07 (patch)
tree0daae33036b28f6d31ee662fc42d818e44b0c538 /linden/indra/newview
parentMerge commit '76dd2a2c2395e50fd31' into next (diff)
downloadmeta-impy-7685169524bf34061ce1631cab60dc170ab78b07.zip
meta-impy-7685169524bf34061ce1631cab60dc170ab78b07.tar.gz
meta-impy-7685169524bf34061ce1631cab60dc170ab78b07.tar.bz2
meta-impy-7685169524bf34061ce1631cab60dc170ab78b07.tar.xz
remove FIXME reminders from fixed issues
modified: linden/indra/newview/llvoavatar.cpp
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llvoavatar.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index f1e45e5..a2bfe68 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -2980,7 +2980,6 @@ void LLVOAvatar::idleUpdateWindEffect()
2980bool LLVOAvatar::updateClientTags() 2980bool LLVOAvatar::updateClientTags()
2981{ 2981{
2982 std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_list.xml"); 2982 std::string client_list_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "client_list.xml");
2983//Imprudence FIXME: provide own ressource
2984 LLSD response = LLHTTPClient::blockingGet("http://www.imprudenceviewer.org/app/client_list/client_list.xml"); 2983 LLSD response = LLHTTPClient::blockingGet("http://www.imprudenceviewer.org/app/client_list/client_list.xml");
2985 if(response.has("body")) 2984 if(response.has("body"))
2986 { 2985 {
@@ -3132,18 +3131,14 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3132 avatar_name_color += LLColor4::magenta; 3131 avatar_name_color += LLColor4::magenta;
3133 avatar_name_color = avatar_name_color * (F32)0.333333333333; 3132 avatar_name_color = avatar_name_color * (F32)0.333333333333;
3134 client = "BetaLife"; 3133 client = "BetaLife";
3135 } 3134 }else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
3136/*
3137 else if(idx == LLUUID("872c0005-3095-0967-866d-11cd71115c22"))
3138 { 3135 {
3139 avatar_name_color += LLColor4::green;//SimFed Poland 3136 avatar_name_color += LLColor4::green;//SimFed Poland
3140 avatar_name_color += LLColor4::blue;//SimFed Poland 3137 avatar_name_color += LLColor4::blue;//SimFed Poland
3141 avatar_name_color += LLColor4::blue;//SimFed Poland 3138 avatar_name_color += LLColor4::blue;//SimFed Poland
3142 avatar_name_color = avatar_name_color * 0.5; 3139 avatar_name_color = avatar_name_color * 0.5;
3143 client = "<-- Fag"; //Imprudence FIXME: Cigarette? Homophobic? My lack of humor? 3140 client = "CryoLife";
3144 } 3141 }else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
3145*/
3146 else if(idx == LLUUID("3ab7e2fa-9572-ef36-1a30-d855dbea4f92") || //wat
3147 idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat. 3142 idx == LLUUID("11ad2452-ce54-8d65-7c23-05589b59f516") ||//wat.
3148 idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat. 3143 idx == LLUUID("e734563e-1c31-2a35-3ed5-8552c807439f") ||//wat.
3149 idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat 3144 idx == LLUUID("58a8b7ec-1455-7162-5d96-d3c3ead2ed71") ||//wat
@@ -3153,8 +3148,6 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3153 avatar_name_color += LLColor4(0.0f,0.5f,1.0f); 3148 avatar_name_color += LLColor4(0.0f,0.5f,1.0f);
3154 avatar_name_color = avatar_name_color * 0.5; 3149 avatar_name_color = avatar_name_color * 0.5;
3155 client = "VerticalLife"; 3150 client = "VerticalLife";
3156
3157
3158 }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f")) 3151 }else if(idx == LLUUID("4e8dcf80-336b-b1d8-ef3e-08dacf015a0f"))
3159 { 3152 {
3160 avatar_name_color += LLColor4::blue; //Sapphire 3153 avatar_name_color += LLColor4::blue; //Sapphire