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

Two updates that sort of went in tandem.

Browse Source 
Updated the Client tag options so that you can turn off tags/colors for others.

However, in the process of doing this the need for Client-Or-Account setting control became increasingly needed, and so a complete rebuild of some sections fetching values were redone across files. The good news is that we now have getCOA* settings for various settings types - Color4, Strings, U/F/S32, and BOOLs. Just include llsavedsettingsglue.h

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-15 00:22:06 -04:00
parent c6b1ba3b84
commit b215b405ea
10 changed files with 278 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llagent.cpp
View File

@@ -95,6 +95,7 @@
#include "llnotify.h"
#include "llprimitive.h" //For new client id method -HgB
#include "llquantize.h"
#include "llsavedsettingsglue.h" //For Client-Or-Account settings
#include "llsdutil.h"
#include "llselectmgr.h"
#include "llsky.h"
@@ -474,16 +475,7 @@ void LLAgent::init()
// LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f);
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{
llinfos << "Using client effect color." << llendl;
mEffectColor = gSavedSettings.getColor4("EffectColor");
}
else
{
llinfos << "Using account effect color." << llendl;
mEffectColor = gSavedPerAccountSettings.getColor4("EffectColor");
}
mEffectColor = LLSavedSettingsGlue::getCOAColor4("EffectColor");
mInitialized = TRUE;
}
@@ -7494,19 +7486,12 @@ void LLAgent::sendAgentSetAppearance()
}
msg->nextBlockFast(_PREHASH_ObjectData);
// Tag changing support
if (!gSavedSettings.controlExists("AscentReportClientUUID"))
{
gSavedSettings.declareString("AscentReportClientUUID", "8873757c-092a-98fb-1afd-ecd347566fcd", "FAKIN' BAKE-IN");
gSavedSettings.setString("AscentReportClientUUID", "8873757c-092a-98fb-1afd-ecd347566fcd");
}
/*if (gSavedSettings.getBOOL("AscentUseCustomTag"))
{
LLColor4 color;
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{
color = gSavedSettings.getColor4("AscentCustomTagColor");
color = LLSavedSettingsGlue::setCOAColor4("AscentCustomTagColor");
}
else
{
@@ -7532,7 +7517,10 @@ void LLAgent::sendAgentSetAppearance()
}
else
{*/
mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentReportClientUUID") );
if (gSavedSettings.getBOOL("AscentUseTag"))
mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentReportClientUUID"));
else
mAvatarObject->packTEMessage( gMessageSystem, 1, "c228d1cf-4b5d-4ba8-84f4-899a0796aa97");
//}
resetClientTag();