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

46
indra/newview/app_settings/settings.xml
View File

@@ -57,6 +57,50 @@
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
<key>AscentUseTag</key>
<map>
<key>Comment</key>
<string>Broadcast client tag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentShowIdleTime</key>
<map>
<key>Comment</key>
<string>Show client tags for others.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentShowOthersTag</key>
<map>
<key>Comment</key>
<string>Show client tags for others.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentShowOthersTagColor</key>
<map>
<key>Comment</key>
<string>Show avatar names in the color of their client.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentBuildAlwaysEnabled</key> <key>AscentBuildAlwaysEnabled</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
@@ -787,7 +831,7 @@
<key>AscentAlwaysRezInGroup</key> <key>AscentAlwaysRezInGroup</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Show your own tag</string> <string>Always rez under the owned land group</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>

170
indra/newview/ascentprefsvan.cpp
View File

@@ -44,6 +44,7 @@
#include "v4color.h" #include "v4color.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
#include "llcombobox.h" #include "llcombobox.h"
#include "llsavedsettingsglue.h"
#include "llwind.h" #include "llwind.h"
#include "llviewernetwork.h" #include "llviewernetwork.h"
#include "pipeline.h" #include "pipeline.h"
@@ -112,16 +113,8 @@ void LLPrefsAscentVanImpl::onCommitColor(LLUICtrl* ctrl, void* user_data)
{ {
llinfos << "Recreating color message for tag update." << llendl; llinfos << "Recreating color message for tag update." << llendl;
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) LLSavedSettingsGlue::setCOAString("AscentCustomTagLabel", self->childGetValue("custom_tag_label_box"));
{ LLSavedSettingsGlue::setCOAColor4("AscentCustomTagColor", self->childGetValue("custom_tag_color_swatch"));
gSavedSettings.setString("AscentCustomTagLabel", self->childGetValue("custom_tag_label_box"));
gSavedSettings.setColor4("AscentCustomTagColor", self->childGetValue("custom_tag_color_swatch"));
}
else
{
gSavedPerAccountSettings.setString("AscentCustomTagLabel", self->childGetValue("custom_tag_label_box"));
gSavedPerAccountSettings.setColor4("AscentCustomTagColor", self->childGetValue("custom_tag_color_swatch"));
}
gAgent.sendAgentSetAppearance(); gAgent.sendAgentSetAppearance();
gAgent.resetClientTag(); gAgent.resetClientTag();
} }
@@ -154,10 +147,7 @@ void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
} }
BOOL showCustomOptions; BOOL showCustomOptions;
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) showCustomOptions = LLSavedSettingsGlue::getCOABOOL("AscentUseCustomTag");
showCustomOptions = gSavedSettings.getBOOL("AscentUseCustomTag");
else
showCustomOptions = gSavedPerAccountSettings.getBOOL("AscentUseCustomTag");
self->childSetValue("customize_own_tag_check", showCustomOptions); self->childSetValue("customize_own_tag_check", showCustomOptions);
self->childSetEnabled("custom_tag_label_text", showCustomOptions); self->childSetEnabled("custom_tag_label_text", showCustomOptions);
self->childSetEnabled("custom_tag_label_box", showCustomOptions); self->childSetEnabled("custom_tag_label_box", showCustomOptions);
@@ -177,52 +167,25 @@ void LLPrefsAscentVanImpl::refreshValues()
mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor"); mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor");
mCustomTagOn = gSavedSettings.getBOOL("AscentUseCustomTag"); mCustomTagOn = gSavedSettings.getBOOL("AscentUseCustomTag");
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) mSelectedClient = LLSavedSettingsGlue::getCOAU32("AscentReportClientIndex");
mEffectColor = LLSavedSettingsGlue::getCOAColor4("EffectColor");
if (LLSavedSettingsGlue::getCOABOOL("AscentUseCustomTag"))
{ {
mSelectedClient = gSavedSettings.getU32("AscentReportClientIndex"); childEnable("custom_tag_label_text");
mEffectColor = gSavedSettings.getColor4("EffectColor"); childEnable("custom_tag_label_box");
if (gSavedSettings.getBOOL("AscentUseCustomTag")) childEnable("custom_tag_color_text");
{ childEnable("custom_tag_color_swatch");
childEnable("custom_tag_label_text");
childEnable("custom_tag_label_box");
childEnable("custom_tag_color_text");
childEnable("custom_tag_color_swatch");
}
else
{
childDisable("custom_tag_label_text");
childDisable("custom_tag_label_box");
childDisable("custom_tag_color_text");
childDisable("custom_tag_color_swatch");
}
mCustomTagLabel = gSavedSettings.getString("AscentCustomTagLabel");
mCustomTagColor = gSavedSettings.getColor4("AscentCustomTagColor");
mFriendColor = gSavedSettings.getColor4("AscentFriendColor");
} }
else else
{ {
mSelectedClient = gSavedPerAccountSettings.getU32("AscentReportClientIndex"); childDisable("custom_tag_label_text");
mEffectColor = gSavedPerAccountSettings.getColor4("EffectColor"); childDisable("custom_tag_label_box");
if (gSavedPerAccountSettings.getBOOL("AscentUseCustomTag")) childDisable("custom_tag_color_text");
{ childDisable("custom_tag_color_swatch");
childEnable("custom_tag_label_text");
childEnable("custom_tag_label_box");
childEnable("custom_tag_color_text");
childEnable("custom_tag_color_swatch");
}
else
{
childDisable("custom_tag_label_text");
childDisable("custom_tag_label_box");
childDisable("custom_tag_color_text");
childDisable("custom_tag_color_swatch");
}
mCustomTagLabel = gSavedPerAccountSettings.getString("AscentCustomTagLabel");
mCustomTagColor = gSavedPerAccountSettings.getColor4("AscentCustomTagColor");
mFriendColor = gSavedPerAccountSettings.getColor4("AscentFriendColor");
} }
mCustomTagLabel = LLSavedSettingsGlue::getCOAString("AscentCustomTagLabel");
mCustomTagColor = LLSavedSettingsGlue::getCOAColor4("AscentCustomTagColor");
mFriendColor = LLSavedSettingsGlue::getCOAColor4("AscentFriendColor");
} }
void LLPrefsAscentVanImpl::refresh() void LLPrefsAscentVanImpl::refresh()
@@ -240,28 +203,13 @@ void LLPrefsAscentVanImpl::refresh()
childSetValue("customize_own_tag_check", mCustomTagOn); childSetValue("customize_own_tag_check", mCustomTagOn);
childSetValue("custom_tag_label_box", mCustomTagLabel); childSetValue("custom_tag_label_box", mCustomTagLabel);
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
{ getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
llinfos << "Retrieving color from client" << llendl; getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor); LLSavedSettingsGlue::setCOAColor4("EffectColor", LLColor4::white);
getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor); LLSavedSettingsGlue::setCOAColor4("EffectColor", mEffectColor);
getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor); LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", LLColor4::yellow);
gSavedSettings.setColor4("EffectColor", LLColor4::white); LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", mFriendColor);
gSavedSettings.setColor4("EffectColor", mEffectColor);
gSavedSettings.setColor4("AscentFriendColor", LLColor4::yellow);
gSavedSettings.setColor4("AscentFriendColor", mFriendColor);
}
else
{
llinfos << "Retrieving color from account" << llendl;
getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white);
gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor);
gSavedPerAccountSettings.setColor4("AscentFriendColor", LLColor4::yellow);
gSavedPerAccountSettings.setColor4("AscentFriendColor", mFriendColor);
}
gAgent.resetClientTag(); gAgent.resetClientTag();
} }
@@ -279,28 +227,13 @@ void LLPrefsAscentVanImpl::cancel()
childSetValue("customize_own_tag_check", mCustomTagOn); childSetValue("customize_own_tag_check", mCustomTagOn);
childSetValue("custom_tag_label_box", mCustomTagLabel); childSetValue("custom_tag_label_box", mCustomTagLabel);
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
{ getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
llinfos << "Retrieving color from client" << llendl; getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor); LLSavedSettingsGlue::setCOAColor4("EffectColor", LLColor4::white);
getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor); LLSavedSettingsGlue::setCOAColor4("EffectColor", mEffectColor);
getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor); LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", LLColor4::yellow);
gSavedSettings.setColor4("EffectColor", LLColor4::white); LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", mFriendColor);
gSavedSettings.setColor4("EffectColor", mEffectColor);
gSavedSettings.setColor4("AscentFriendColor", LLColor4::yellow);
gSavedSettings.setColor4("AscentFriendColor", mFriendColor);
}
else
{
llinfos << "Retrieving color from account" << llendl;
getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
getChild<LLColorSwatchCtrl>("friend_color_swatch")->set(mFriendColor);
gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white);
gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor);
gSavedPerAccountSettings.setColor4("AscentFriendColor", LLColor4::yellow);
gSavedPerAccountSettings.setColor4("AscentFriendColor", mFriendColor);
}
} }
void LLPrefsAscentVanImpl::apply() void LLPrefsAscentVanImpl::apply()
@@ -319,18 +252,8 @@ void LLPrefsAscentVanImpl::apply()
if (client_index != mSelectedClient) if (client_index != mSelectedClient)
{ {
client_uuid = combo->getSelectedValue().asString(); client_uuid = combo->getSelectedValue().asString();
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) LLSavedSettingsGlue::setCOAString("AscentReportClientUUID", client_uuid);
{ LLSavedSettingsGlue::setCOAU32("AscentReportClientIndex", client_index);
llinfos << "Setting texture to: " << client_uuid << llendl;
gSavedSettings.setString("AscentReportClientUUID", client_uuid);
gSavedSettings.setU32("AscentReportClientIndex", client_index);
}
else
{
llinfos << "Setting texture to: " << client_uuid << llendl;
gSavedPerAccountSettings.setString("AscentReportClientUUID", client_uuid);
gSavedPerAccountSettings.setU32("AscentReportClientIndex", client_index);
}
LLVOAvatar* avatar = gAgent.getAvatarObject(); LLVOAvatar* avatar = gAgent.getAvatarObject();
if (!avatar) return; if (!avatar) return;
@@ -342,26 +265,11 @@ void LLPrefsAscentVanImpl::apply()
gSavedSettings.setBOOL("AscentShowSelfTag", childGetValue("show_self_tag_check")); gSavedSettings.setBOOL("AscentShowSelfTag", childGetValue("show_self_tag_check"));
gSavedSettings.setBOOL("AscentShowSelfTagColor", childGetValue("show_self_tag_color_check")); gSavedSettings.setBOOL("AscentShowSelfTagColor", childGetValue("show_self_tag_color_check"));
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) LLSavedSettingsGlue::setCOAColor4("EffectColor", childGetValue("effect_color_swatch"));
{ LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", childGetValue("friend_color_swatch"));
llinfos << "Storing color in client" << llendl; LLSavedSettingsGlue::setCOABOOL("AscentUseCustomTag", childGetValue("customize_own_tag_check"));
gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); LLSavedSettingsGlue::setCOAString("AscentCustomTagLabel", childGetValue("custom_tag_label_box"));
gSavedSettings.setColor4("AscentFriendColor", childGetValue("friend_color_swatch")); LLSavedSettingsGlue::setCOAColor4("AscentCustomTagColor", childGetValue("custom_tag_color_swatch"));
gSavedSettings.setBOOL("AscentUseCustomTag", childGetValue("customize_own_tag_check"));
gSavedSettings.setString("AscentCustomTagLabel", childGetValue("custom_tag_label_box"));
gSavedSettings.setColor4("AscentCustomTagColor", childGetValue("custom_tag_color_swatch"));
}
else
{
llinfos << "Storing color in account" << llendl;
gSavedPerAccountSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
gSavedPerAccountSettings.setColor4("AscentFriendColor", childGetValue("friend_color_swatch"));
gSavedPerAccountSettings.setBOOL("AscentUseCustomTag", childGetValue("customize_own_tag_check"));
gSavedPerAccountSettings.setString("AscentCustomTagLabel", childGetValue("custom_tag_label_box"));
gSavedPerAccountSettings.setColor4("AscentCustomTagColor", childGetValue("custom_tag_color_swatch"));
}
refreshValues(); refreshValues();
} }

26
indra/newview/llagent.cpp
View File

@@ -95,6 +95,7 @@
#include "llnotify.h" #include "llnotify.h"
#include "llprimitive.h" //For new client id method -HgB #include "llprimitive.h" //For new client id method -HgB
#include "llquantize.h" #include "llquantize.h"
#include "llsavedsettingsglue.h" //For Client-Or-Account settings
#include "llsdutil.h" #include "llsdutil.h"
#include "llselectmgr.h" #include "llselectmgr.h"
#include "llsky.h" #include "llsky.h"
@@ -474,16 +475,7 @@ void LLAgent::init()
// LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f); // LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f);
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) mEffectColor = LLSavedSettingsGlue::getCOAColor4("EffectColor");
{
llinfos << "Using client effect color." << llendl;
mEffectColor = gSavedSettings.getColor4("EffectColor");
}
else
{
llinfos << "Using account effect color." << llendl;
mEffectColor = gSavedPerAccountSettings.getColor4("EffectColor");
}
mInitialized = TRUE; mInitialized = TRUE;
} }
@@ -7494,19 +7486,12 @@ void LLAgent::sendAgentSetAppearance()
} }
msg->nextBlockFast(_PREHASH_ObjectData); 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")) /*if (gSavedSettings.getBOOL("AscentUseCustomTag"))
{ {
LLColor4 color; LLColor4 color;
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{ {
color = gSavedSettings.getColor4("AscentCustomTagColor"); color = LLSavedSettingsGlue::setCOAColor4("AscentCustomTagColor");
} }
else else
{ {
@@ -7532,7 +7517,10 @@ void LLAgent::sendAgentSetAppearance()
} }
else 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(); resetClientTag();

21
indra/newview/llfloateravatarlist.cpp
View File

@@ -31,6 +31,7 @@
#include "llregionflags.h" #include "llregionflags.h"
#include "llfloaterreporter.h" #include "llfloaterreporter.h"
#include "llagent.h" #include "llagent.h"
#include "llsavedsettingsglue.h"
#include "llviewerregion.h" #include "llviewerregion.h"
#include "lltracker.h" #include "lltracker.h"
#include "llviewerstats.h" #include "llviewerstats.h"
@@ -707,34 +708,22 @@ void LLFloaterAvatarList::refreshAvatarList()
//Lindens are always more Linden than your friend, make that take precedence //Lindens are always more Linden than your friend, make that take precedence
if(LLMuteList::getInstance()->isLinden(av_name)) if(LLMuteList::getInstance()->isLinden(av_name))
{ {
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) element["columns"][LIST_AVATAR_NAME]["color"] = LLSavedSettingsGlue::getCOAColor4("AscentLindenColor").getValue();
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedSettings.getColor4("AscentLindenColor").getValue();
else
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedPerAccountSettings.getColor4("AscentLindenColor").getValue();
} }
//check if they are an estate owner at their current position //check if they are an estate owner at their current position
else if(estate_owner.notNull() && av_id == estate_owner) else if(estate_owner.notNull() && av_id == estate_owner)
{ {
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) element["columns"][LIST_AVATAR_NAME]["color"] = LLSavedSettingsGlue::getCOAColor4("AscentEstateOwnerColor").getValue();
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedSettings.getColor4("AscentEstateOwnerColor").getValue();
else
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedPerAccountSettings.getColor4("AscentEstateOwnerColor").getValue();
} }
//without these dots, SL would suck. //without these dots, SL would suck.
else if(is_agent_friend(av_id)) else if(is_agent_friend(av_id))
{ {
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) element["columns"][LIST_AVATAR_NAME]["color"] = LLSavedSettingsGlue::getCOAColor4("AscentFriendColor").getValue();
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedSettings.getColor4("AscentFriendColor").getValue();
else
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedPerAccountSettings.getColor4("AscentFriendColor").getValue();
} }
//big fat jerkface who is probably a jerk, display them as such. //big fat jerkface who is probably a jerk, display them as such.
else if(LLMuteList::getInstance()->isMuted(av_id)) else if(LLMuteList::getInstance()->isMuted(av_id))
{ {
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) element["columns"][LIST_AVATAR_NAME]["color"] = LLSavedSettingsGlue::getCOAColor4("AscentMutedColor").getValue();
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedSettings.getColor4("AscentMutedColor").getValue();
else
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedPerAccountSettings.getColor4("AscentMutedColor").getValue();
} }

21
indra/newview/llnetmap.cpp
View File

@@ -50,6 +50,7 @@
#include "llframetimer.h" #include "llframetimer.h"
#include "lltracker.h" #include "lltracker.h"
#include "llmenugl.h" #include "llmenugl.h"
#include "llsavedsettingsglue.h"
#include "llsurface.h" #include "llsurface.h"
#include "lltextbox.h" #include "lltextbox.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
@@ -356,34 +357,22 @@ void LLNetMap::draw()
//Lindens are always more Linden than your friend, make that take precedence //Lindens are always more Linden than your friend, make that take precedence
if(LLMuteList::getInstance()->isLinden(avName)) if(LLMuteList::getInstance()->isLinden(avName))
{ {
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) avColor = LLSavedSettingsGlue::getCOAColor4("AscentLindenColor");
avColor = gSavedSettings.getColor4("AscentLindenColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentLindenColor");
} }
//check if they are an estate owner at their current position //check if they are an estate owner at their current position
else if(estate_owner.notNull() && avatar_ids[i] == estate_owner) else if(estate_owner.notNull() && avatar_ids[i] == estate_owner)
{ {
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) avColor = LLSavedSettingsGlue::getCOAColor4("AscentEstateOwnerColor");
avColor = gSavedSettings.getColor4("AscentEstateOwnerColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentEstateOwnerColor");
} }
//without these dots, SL would suck. //without these dots, SL would suck.
else if(is_agent_friend(avatar_ids[i])) else if(is_agent_friend(avatar_ids[i]))
{ {
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) avColor = LLSavedSettingsGlue::getCOAColor4("AscentFriendColor");
avColor = gSavedSettings.getColor4("AscentFriendColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentFriendColor");
} }
//big fat jerkface who is probably a jerk, display them as such. //big fat jerkface who is probably a jerk, display them as such.
else if(LLMuteList::getInstance()->isMuted(avatar_ids[i])) else if(LLMuteList::getInstance()->isMuted(avatar_ids[i]))
{ {
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) avColor = LLSavedSettingsGlue::getCOAColor4("AscentMutedColor");
avColor = gSavedSettings.getColor4("AscentMutedColor");
else
avColor = gSavedPerAccountSettings.getColor4("AscentMutedColor");
} }
LLWorldMapView::drawAvatar( LLWorldMapView::drawAvatar(

102
indra/newview/llsavedsettingsglue.cpp
View File

@@ -73,3 +73,105 @@ void LLSavedSettingsGlue::setString(LLUICtrl* ctrl, void* data)
LLSD value = ctrl->getValue(); LLSD value = ctrl->getValue();
gSavedSettings.setString(name, value.asString()); gSavedSettings.setString(name, value.asString());
} }
//Begin Ascent SavedSettings/PerAccountSettings handling
//Get
BOOL LLSavedSettingsGlue::getCOABOOL(std::string name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getBOOL(name);
else
return gSavedPerAccountSettings.getBOOL(name);
}
S32 LLSavedSettingsGlue::getCOAS32(std::string name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getS32(name);
else
return gSavedPerAccountSettings.getS32(name);
}
F32 LLSavedSettingsGlue::getCOAF32(std::string name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getF32(name);
else
return gSavedPerAccountSettings.getF32(name);
}
U32 LLSavedSettingsGlue::getCOAU32(std::string name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getU32(name);
else
return gSavedPerAccountSettings.getU32(name);
}
std::string LLSavedSettingsGlue::getCOAString(std::string name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getString(name);
else
return gSavedPerAccountSettings.getString(name);
}
LLColor4 LLSavedSettingsGlue::getCOAColor4(std::string name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getColor4(name);
else
return gSavedPerAccountSettings.getColor4(name);
}
//Set
void LLSavedSettingsGlue::setCOABOOL(std::string name, BOOL value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setBOOL(name, value);
else
gSavedPerAccountSettings.setBOOL(name, value);
}
void LLSavedSettingsGlue::setCOAS32(std::string name, S32 value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setS32(name, value);
else
gSavedPerAccountSettings.setS32(name, value);
}
void LLSavedSettingsGlue::setCOAF32(std::string name, F32 value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setF32(name, value);
else
gSavedPerAccountSettings.setF32(name, value);
}
void LLSavedSettingsGlue::setCOAU32(std::string name, U32 value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setU32(name, value);
else
gSavedPerAccountSettings.setU32(name, value);
}
void LLSavedSettingsGlue::setCOAString(std::string name, std::string value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setString(name, value);
else
gSavedPerAccountSettings.setString(name, value);
}
void LLSavedSettingsGlue::setCOAColor4(std::string name, LLColor4 value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setColor4(name, value);
else
gSavedPerAccountSettings.setColor4(name, value);
}

16
indra/newview/llsavedsettingsglue.h
View File

@@ -47,6 +47,22 @@ public:
static void setF32(LLUICtrl* ctrl, void* name); static void setF32(LLUICtrl* ctrl, void* name);
static void setU32(LLUICtrl* ctrl, void* name); static void setU32(LLUICtrl* ctrl, void* name);
static void setString(LLUICtrl* ctrl, void* name); static void setString(LLUICtrl* ctrl, void* name);
//Ascent Client-Or-Account Settings Get
static BOOL getCOABOOL(std::string name);
static S32 getCOAS32(std::string name);
static F32 getCOAF32(std::string name);
static U32 getCOAU32(std::string name);
static std::string getCOAString(std::string name);
static LLColor4 getCOAColor4(std::string name);
//Ascent Client-Or-Account Settings Set
static void setCOABOOL(std::string name, BOOL value);
static void setCOAS32(std::string name, S32 value);
static void setCOAF32(std::string name, F32 value);
static void setCOAU32(std::string name, U32 value);
static void setCOAString(std::string name, std::string value);
static void setCOAColor4(std::string name, LLColor4 value);
}; };
#endif #endif

50
indra/newview/llvoavatar.cpp
View File

@@ -87,6 +87,7 @@
#include "llvoicevisualizer.h" // Ventrella #include "llvoicevisualizer.h" // Ventrella
#include "llsdserialize.h" //For the client definitions #include "llsdserialize.h" //For the client definitions
#include "llsavedsettingsglue.h" //For optionally per-account settings
// <edit> // <edit>
#include "llfloaterexploreanimations.h" #include "llfloaterexploreanimations.h"
#include "llao.h" #include "llao.h"
@@ -3312,11 +3313,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
std::string uuid_str = getTE(TEX_HEAD_BODYPAINT)->getID().asString(); //UUID of the head texture std::string uuid_str = getTE(TEX_HEAD_BODYPAINT)->getID().asString(); //UUID of the head texture
if (mIsSelf) if (mIsSelf)
{ {
BOOL showCustomTag; BOOL showCustomTag = LLSavedSettingsGlue::getCOABOOL("AscentUseCustomTag");
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
showCustomTag = gSavedSettings.getBOOL("AscentUseCustomTag");
else
showCustomTag = gSavedPerAccountSettings.getBOOL("AscentUseCustomTag");
if (!gSavedSettings.getBOOL("AscentShowSelfTagColor")) if (!gSavedSettings.getBOOL("AscentShowSelfTagColor"))
{ {
color = gColors.getColor( "AvatarNameColor" ); color = gColors.getColor( "AvatarNameColor" );
@@ -3324,26 +3321,12 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
} }
else if (showCustomTag) else if (showCustomTag)
{ {
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) color = LLSavedSettingsGlue::getCOAColor4("AscentCustomTagColor");
{ client = LLSavedSettingsGlue::getCOAString("AscentCustomTagLabel");
color = gSavedSettings.getColor4("AscentCustomTagColor");
client = gSavedSettings.getString("AscentCustomTagLabel");
}
else
{
color = gSavedPerAccountSettings.getColor4("AscentCustomTagColor");
client = gSavedPerAccountSettings.getString("AscentCustomTagLabel");
}
return; return;
} }
else if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) else if (gSavedSettings.getBOOL("AscentUseTag"))
{ uuid_str = LLSavedSettingsGlue::getCOAString("AscentReportClientUUID");
uuid_str = gSavedSettings.getString("AscentReportClientUUID");
}
else
{
uuid_str = gSavedPerAccountSettings.getString("AscentReportClientUUID");
}
} }
if(getTEImage(TEX_HEAD_BODYPAINT)->getID() == IMG_DEFAULT_AVATAR) if(getTEImage(TEX_HEAD_BODYPAINT)->getID() == IMG_DEFAULT_AVATAR)
{ {
@@ -3561,7 +3544,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
//Zwagoth's new client identification - HgB //Zwagoth's new client identification - HgB
// Overwrite the current tag/color settings if new method // Overwrite the current tag/color settings if new method
// exists -- charbl. // exists -- charbl.
/*const LLTextureEntry* texentry = getTE(0); const LLTextureEntry* texentry = getTE(0);
if(texentry->getGlow() > 0.0) if(texentry->getGlow() > 0.0)
{ {
llinfos << "Using new client identifier." << llendl; llinfos << "Using new client identifier." << llendl;
@@ -3577,11 +3560,11 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
mClientColor = texentry->getColor(); mClientColor = texentry->getColor();
} }
else else
{*/ {
llinfos << "Using Emerald-style client identifier." << llendl; llinfos << "Using Emerald-style client identifier." << llendl;
//The old client identification. Used only if the new method doesn't exist, so that it isn't automatically overwritten. -HgB //The old client identification. Used only if the new method doesn't exist, so that it isn't automatically overwritten. -HgB
getClientInfo(mClientTag,mClientColor); getClientInfo(mClientTag,mClientColor);
//} }
} }
// Overwrite the tag/color shit yet again if we want to see // Overwrite the tag/color shit yet again if we want to see
@@ -3591,15 +3574,15 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
if (gSavedSettings.getBOOL("AscentShowFriendsTag")) if (gSavedSettings.getBOOL("AscentShowFriendsTag"))
{ {
mClientTag = "Friend"; mClientTag = "Friend";
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) mClientColor = LLSavedSettingsGlue::getCOAColor4("AscentFriendColor");
mClientColor = gSavedSettings.getColor4("AscentFriendColor");
else
mClientColor = gSavedPerAccountSettings.getColor4("AscentFriendColor");
} }
} }
} }
client = mClientTag; client = mClientTag;
avatar_name_color = mClientColor; if ((mIsSelf && gSavedSettings.getBOOL("AscentShowSelfTagColor"))
|| (!mIsSelf && gSavedSettings.getBOOL("AscentShowOthersTagColor")))
avatar_name_color = mClientColor;
avatar_name_color.setAlpha(alpha); avatar_name_color.setAlpha(alpha);
@@ -3707,7 +3690,8 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
{ {
if ((client != "")&&(client != "?")) if ((client != "")&&(client != "?"))
{ {
if ((!mIsSelf)||(gSavedSettings.getBOOL("AscentShowSelfTag"))) if ((mIsSelf && gSavedSettings.getBOOL("AscentShowSelfTag"))
|| (!mIsSelf && gSavedSettings.getBOOL("AscentShowOthersTag")))
{ {
additions += client; additions += client;
need_comma = TRUE; need_comma = TRUE;
@@ -3749,7 +3733,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
line += "\n"; line += "\n";
line += "(Editing Appearance)"; line += "(Editing Appearance)";
} }
if(!mIsSelf && mIdleTimer.getElapsedTimeF32() > 120) if(!mIsSelf && mIdleTimer.getElapsedTimeF32() > 120 && gSavedSettings.getBOOL("AscentShowIdleTime"))
{ {
line += "\n"; line += "\n";
line += getIdleTime(); line += getIdleTime();

2
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom" <panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
border="true" label="Ascent System" name="ascsys" enabled="true" mouse_opaque="true"> border="true" label="Ascent System" name="ascsys" enabled="true" mouse_opaque="true">
<tab_container label="Ascent" bottom="0" height="440" width="500" left="0" <tab_container label="Ascent" bottom="0" height="440" width="497" left="0"
name="Ascent System" tab_min_width="70" tab_position="top"> name="Ascent System" tab_min_width="70" tab_position="top">
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true" <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="General" name="User Interface"> follows="left|top|right|bottom" label="General" name="User Interface">

68
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom" <panel top="20" left="10" height="400" width="512" follows="left|top|right|bottom"
border="true" label="Ascent Vanity" name="ascvan" enabled="true" mouse_opaque="true"> border="true" label="Ascent Vanity" name="ascvan" enabled="true" mouse_opaque="true">
<tab_container label="Ascent" bottom="0" height="440" width="500" left="0" <tab_container label="Ascent" bottom="0" height="440" width="497" left="0"
name="Ascent Vanity" tab_min_width="90" tab_position="top"> name="Ascent Vanity" tab_min_width="90" tab_position="top">
<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true" <panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="General" name="General"> follows="left|top|right|bottom" label="General" name="General">
@@ -17,15 +17,14 @@
<!-- Client tag options --> <!-- Client tag options -->
<view_border bevel_style="none" border_thickness="1" bottom="-115" follows="top|left" <view_border bevel_style="none" border_thickness="1" bottom="-115" follows="top|left"
height="110" left="5" name="GraphicsBorder" width="485" /> height="110" left="5" name="GraphicsBorder" width="485" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <check_box bottom_delta="90" control_name="AscentUseTag" enabled="true"
bottom_delta="94" drop_shadow_visible="true" enabled="true" follows="left|top" follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false" label="Use Client Tag:" left_delta="0"
left_delta="9" mouse_opaque="true" name="client_tag_text_box" v_pad="0" tool_tip="Enabling this will show your client tag on your avatar name locally."
width="90"> mouse_opaque="true" name="show_client_tag_check" radio_style="false"
Client Tag: width="400" />
</text>
<combo_box allow_text_entry="false" enabled="true" follows="left|top" <combo_box allow_text_entry="false" enabled="true" follows="left|top"
bottom_delta="-28" height="18" hidden="false" left_delta="0" max_chars="20" mouse_opaque="true" bottom_delta="-24" height="18" hidden="false" left_delta="24" max_chars="20" mouse_opaque="true"
tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color." tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color."
name="tag_spoofing_combobox" width="130"> name="tag_spoofing_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="Ascent" <combo_item type="string" length="1" enabled="true" name="Ascent"
@@ -36,14 +35,10 @@
value="734fed29-4c51-63e5-1648-6589949d7585"> value="734fed29-4c51-63e5-1648-6589949d7585">
Explicit Explicit
</combo_item> </combo_item>
<combo_item type="string" length="1" enabled="true" name="Hide Tag"
value="c228d1cf-4b5d-4ba8-84f4-899a0796aa97">
No Tag
</combo_item>
</combo_box> </combo_box>
<check_box bottom_delta="-23" control_name="AscentShowSelfTag" enabled="true" <check_box bottom_delta="-23" control_name="AscentShowSelfTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Display client tag to self" left_delta="0" label="Display client tag to self" left_delta="-24"
tool_tip="Enabling this will show your client tag on your avatar name locally." tool_tip="Enabling this will show your client tag on your avatar name locally."
mouse_opaque="true" name="show_self_tag_check" radio_style="false" mouse_opaque="true" name="show_self_tag_check" radio_style="false"
width="400" /> width="400" />
@@ -53,39 +48,58 @@
tool_tip="Enabling this set your avatar name color to your client tag color or custom set color." tool_tip="Enabling this set your avatar name color to your client tag color or custom set color."
mouse_opaque="true" name="show_self_tag_color_check" radio_style="false" mouse_opaque="true" name="show_self_tag_color_check" radio_style="false"
width="400" /> width="400" />
<check_box bottom_delta="-20" control_name="AscentShowFriendsTag" enabled="true" <check_box bottom_delta="-20" control_name="AscentShowFriendsTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Display friend client tags as (Friend)" left_delta="0" label="Display friend client tags as (Friend)" left_delta="0"
tool_tip="Enabling this changes your friends' client tags to (Friend)." tool_tip="Enabling this changes your friends' client tags to (Friend)."
mouse_opaque="true" name="show_friend_tag_check" radio_style="false" mouse_opaque="true" name="show_friend_tag_check" radio_style="false"
width="400" /> width="400" />
<check_box bottom_delta="65" control_name="AscentUseCustomTag" enabled="true" <!-- End of Left Side -->
<check_box bottom_delta="87" control_name="AscentUseCustomTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Use a custom color and label (Local only)" left_delta="230" label="Use a custom color and label (Local only)" left_delta="230"
tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself." tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself."
mouse_opaque="true" name="customize_own_tag_check" radio_style="false" mouse_opaque="true" name="customize_own_tag_check" radio_style="false"
width="400" /> width="400" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-16" left_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top" bottom_delta="-17" left_delta="25" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" font="SansSerifSmall" h_pad="0" halign="left" height="10"
mouse_opaque="true" name="custom_tag_label_text" v_pad="0" width="394"> mouse_opaque="true" name="custom_tag_label_text" v_pad="0" width="394">
Tag Label: Label:
</text> </text>
<line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif" <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
height="20" left_delta="60" name="custom_tag_label_box" height="18" left_delta="35" name="custom_tag_label_box"
tool_tip="The custom string you would like to replace your client tag with (Local only)" tool_tip="The custom string you would like to replace your client tag with (Local only)"
width="170" /> width="100" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" left_delta="-60" drop_shadow_visible="true" enabled="true" follows="left|top" bottom_delta="6" left_delta="110" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" font="SansSerifSmall" h_pad="0" halign="left" height="10"
mouse_opaque="true" name="custom_tag_color_text" v_pad="0" width="394"> mouse_opaque="true" name="custom_tag_color_text" v_pad="0" width="394">
Tag color: Color:
</text> </text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-29" <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"
can_apply_immediately="false" color="1 1 1 1" can_apply_immediately="false" color="1 1 1 1"
enabled="true" follows="left|top" height="48" label="" left_delta="60" enabled="true" follows="left|top" height="34" label="" left_delta="35"
mouse_opaque="true" name="custom_tag_color_swatch" mouse_opaque="true" name="custom_tag_color_swatch"
tool_tip="The custom color you would like to replace your client color with (Local only)" width="32" /> tool_tip="The custom color you would like to replace your client color with (Local only)" width="30" />
<check_box bottom_delta="-8" control_name="AscentShowOthersTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Display client tag for others" left_delta="-205"
tool_tip="Enabling this will show client tag names on others' avatar names."
mouse_opaque="true" name="show_client_tag_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Display client tag color for others" left_delta="0"
tool_tip="Enabling this sets others' avatar name color to their client's color."
mouse_opaque="true" name="show_client_tag_color_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentShowIdleTime" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Show Idle Time" left_delta="0"
tool_tip="Enabling this will show the amount of time an avatar has been idle."
mouse_opaque="true" name="show_idle_time_check" radio_style="false"
width="400" />
<!-- End of Client Tag settings --> <!-- End of Client Tag settings -->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-143" drop_shadow_visible="true" enabled="true" follows="left|top" bottom="-143" drop_shadow_visible="true" enabled="true" follows="left|top"