From 48850b2af074a4b20347d34914ed60cb58511a35 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Tue, 26 Nov 2013 01:03:10 +0100 Subject: [PATCH] Compile fix. This appears to be committed blindly without testing even if it build. ll_sd_from_color4() / ll_color4_from_sd() need to be used to store and get color from LLSD. --- indra/newview/llfloaterfriends.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp index b8f155914..095034be9 100644 --- a/indra/newview/llfloaterfriends.cpp +++ b/indra/newview/llfloaterfriends.cpp @@ -37,7 +37,7 @@ #include "llfloaterfriends.h" - +#include "llsdutil_math.h" #include "llagent.h" #include "llavataractions.h" #include "llavatarnamecache.h" @@ -428,7 +428,7 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id) friend_column["font-style"] = "NORMAL"; static const LLCachedControl sDefaultColor(gColors, "DefaultListText"); static const LLCachedControl sMutedColor("AscentMutedColor"); - friend_column["color"] = LLAvatarActions::isBlocked(agent_id) ? sMutedColor : sDefaultColor; + friend_column["color"] = ll_sd_from_color4(LLAvatarActions::isBlocked(agent_id) ? sMutedColor : sDefaultColor); LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS]; online_status_column["column"] = "icon_online_status";