Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fix.

Browse Source 
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.
This commit is contained in:
Latif Khalifa
2013-11-26 01:03:10 +01:00
parent 4e79bce3e2
commit 48850b2af0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterfriends.cpp
View File

@@ -37,7 +37,7 @@
#include "llfloaterfriends.h" #include "llfloaterfriends.h"
#include "llsdutil_math.h"
#include "llagent.h" #include "llagent.h"
#include "llavataractions.h" #include "llavataractions.h"
#include "llavatarnamecache.h" #include "llavatarnamecache.h"
@@ -428,7 +428,7 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
friend_column["font-style"] = "NORMAL"; friend_column["font-style"] = "NORMAL";
static const LLCachedControl<LLColor4> sDefaultColor(gColors, "DefaultListText"); static const LLCachedControl<LLColor4> sDefaultColor(gColors, "DefaultListText");
static const LLCachedControl<LLColor4> sMutedColor("AscentMutedColor"); static const LLCachedControl<LLColor4> 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]; LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS];
online_status_column["column"] = "icon_online_status"; online_status_column["column"] = "icon_online_status";