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

New color tag system is basically in, but commented out. Color works, but takes a while to update for the user.

Browse Source 
Couple of minor bugfixes with color settings - We need to finish the color settings that we have planned and soon, since one of a set of four got pushed in without the matching set.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-03 16:38:05 -04:00
parent 4b6d1ab019
commit fa0143f917
9 changed files with 178 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llnetmap.cpp
View File

@@ -356,7 +356,7 @@ void LLNetMap::draw()
//Lindens are always more Linden than your friend, make that take precedence
if(LLMuteList::getInstance()->isLinden(avName))
{
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
avColor = gSavedSettings.getColor4("AscentLindenColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentLindenColor");
@@ -364,7 +364,7 @@ void LLNetMap::draw()
//check if they are an estate owner at their current position
else if(estate_owner.notNull() && avatar_ids[i] == estate_owner)
{
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
avColor = gSavedSettings.getColor4("AscentEstateOwnerColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentEstateOwnerColor");
@@ -372,7 +372,7 @@ void LLNetMap::draw()
//without these dots, SL would suck.
else if(is_agent_friend(avatar_ids[i]))
{
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
avColor = gSavedSettings.getColor4("AscentFriendColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentFriendColor");
@@ -380,7 +380,7 @@ void LLNetMap::draw()
//big fat jerkface who is probably a jerk, display them as such.
else if(LLMuteList::getInstance()->isMuted(avatar_ids[i]))
{
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
avColor = gSavedSettings.getColor4("AscentMutedColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentMutedColor");