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

26
indra/newview/llagent.cpp
View File

@@ -824,6 +824,12 @@ BOOL LLAgent::getPhantom()
{
return exlPhantom;
}
void LLAgent::resetClientTag()
{
llinfos << "Resetting mClientTag." << llendl;
mAvatarObject->mClientTag = "";
}
//
//-----------------------------------------------------------------------------
@@ -7499,8 +7505,17 @@ void LLAgent::sendAgentSetAppearance()
gSavedSettings.setString("AscentReportClientUUID", "8873757c-092a-98fb-1afd-ecd347566fcd");
}
if(gSavedSettings.getString("AscentReportClientUUID") != "c228d1cf-4b5d-4ba8-84f4-899a0796aa97")
/*if (gSavedSettings.getBOOL("AscentUseCustomTag"))
{
LLColor4 color;
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{
color = gSavedSettings.getColor4("AscentCustomTagColor");
}
else
{
color = gSavedPerAccountSettings.getColor4("AscentCustomTagColor");
}
LLUUID old_teid;
U8 client_buffer[UUID_BYTES];
memset(&client_buffer, 0, UUID_BYTES);
@@ -7511,18 +7526,19 @@ void LLAgent::sendAgentSetAppearance()
strncpy((char*)&client_buffer[0], tag_client, UUID_BYTES);
LLUUID part_a;
memcpy(&part_a.mData, &client_buffer[0], UUID_BYTES);
entry->setColor(gSavedSettings.getColor4("AscentCustomTagColor") );
entry->setColor(color);
//This glow is used to tell if the tag color and name is set or not.
entry->setGlow(0.1f);
entry->setID(part_a);
mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentReportClientUUID") );
entry->setID(old_teid);
}
else
{
{*/
mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentReportClientUUID") );
}
//}
resetClientTag();
}
else