FIRE-1061: Add a colors tab in prefs to control colorizing chat, net map dots, and nametags for self, friends, muted, lindens, and firestorm team members.

master
Cinders 2013-05-26 17:23:21 -06:00
parent dd18215916
commit c2027a4ea0
13 changed files with 682 additions and 327 deletions

View File

@ -11431,17 +11431,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>NameTagShowFriends</key>
<map>
<key>Comment</key>
<string>Highlight the name tags of your friends</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>NameTagShowUsernames</key>
<map>
<key>Comment</key>
@ -20461,5 +20450,93 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSColorizeFriends</key>
<map>
<key>Comment</key>
<string>Color friends with a special color</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSColorizeMuted</key>
<map>
<key>Comment</key>
<string>Color muted avatars with a special color</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSColorizeLindens</key>
<map>
<key>Comment</key>
<string>Color Lindens with a special color</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSColorizeFirestorm</key>
<map>
<key>Comment</key>
<string>Color Firestorm developers and support with a special color</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSColorizeSelf</key>
<map>
<key>Comment</key>
<string>Color yourself with a special color, you special little snowflake</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSColorizeChat</key>
<map>
<key>Comment</key>
<string>Color special avatars in chat (Friend, muted, Linden, Firestorm)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSColorizeTags</key>
<map>
<key>Comment</key>
<string>Color special avatars in nametags (Friend, muted, Linden, Firestorm)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSColorizeMap</key>
<map>
<key>Comment</key>
<string>Color special avatars on the minimap (Friend, muted, Linden, Firestorm)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

View File

@ -272,6 +272,12 @@ void FSConsoleUtils::onProccessInstantMessageNameLookup(const LLUUID& agent_id,
}
LLColor4 textColor = LLUIColorTable::instance().getColor("AgentChatColor");
// <FS:CR> FIRE-1061 - Color friends, lindens, muted, etc
static LLUICachedControl<bool> fs_colorize("FSColorizeChat");
if (fs_colorize)
textColor = LGGContactSets::getInstance()->getSpecialColor(agent_id, textColor);
// </FS:CR>
//color based on contact sets prefs
if (LGGContactSets::getInstance()->hasFriendColorThatShouldShow(agent_id, LGG_CS_CHAT))

View File

@ -504,6 +504,10 @@ void FSRadar::updateRadarList()
}
entry_options["name_style"] = nameCellStyle;
// <FS:CR> TODO: Decide whether we want special colored names in the radar or let the current UI suffice
//LLColor4 name_color = LGGContactSets::getInstance()->getSpecialColor(avId, range_color);
//entry_options["name_color"] = name_color.getValue();
if (LGGContactSets::getInstance()->hasFriendColorThatShouldShow(avId, LGG_CS_RADAR))
{
LLColor4 name_color = LGGContactSets::getInstance()->getFriendColor(avId);

View File

@ -19,12 +19,15 @@
#include "llviewerprecompiledheaders.h"
#include "lggcontactsets.h"
#include "llagent.h"
#include "llavatarnamecache.h"
#include "llcallingcard.h"
#include "lldir.h"
#include "llmutelist.h"
#include "llnotifications.h"
#include "llsdserialize.h"
#include "llviewercontrol.h"
#include "llnotifications.h"
#include "lldir.h"
#include "llcallingcard.h"
#include "llavatarnamecache.h"
#include "fsdata.h"
#include "rlvhandler.h"
LGGContactSets::LGGContactSets() :
@ -331,6 +334,43 @@ LLColor4 LGGContactSets::getGroupColor(const std::string& groupName)
return getDefaultColor();
};
LLColor4 LGGContactSets::getSpecialColor(const LLUUID& uuid, const LLColor4& cur_color)
{
LLColor4 color = cur_color;
FSData* fs_data = FSData::getInstance();
std::string full_name;
static LLUICachedControl<bool> fs_colorize_self("FSColorizeSelf");
static LLUICachedControl<bool> fs_colorize_friends("FSColorizeFriends");
static LLUICachedControl<bool> fs_colorize_muted("FSColorizeMuted");
static LLUICachedControl<bool> fs_colorize_lindens("FSColorizeLindens");
static LLUICachedControl<bool> fs_colorize_firestorm("FSColorizeFirestorm");
static LLUIColor avatar_self_color = LLUIColorTable::instance().getColor("UserChatColor", LLColor4::yellow);
static LLUIColor avatar_friend_color = LLUIColorTable::instance().getColor("MapAvatarFriendColor", LLColor4::white);
static LLUIColor avatar_muted_color = LLUIColorTable::instance().getColor("MapAvatarMutedColor", LLColor4::grey3);
static LLUIColor avatar_linden_color = LLUIColorTable::instance().getColor("MapAvatarLindenColor", LLColor4::blue);
static LLUIColor avatar_firestorm_color = LLUIColorTable::instance().getColor("MapAvatarFirestormColor", LLColor4::red);
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
return color;
else if (fs_colorize_self && uuid == gAgent.getID())
color = avatar_self_color;
else if (fs_colorize_muted && LLMuteList::getInstance()->isMuted(uuid))
color = avatar_muted_color;
else if (fs_colorize_friends && (LLAvatarTracker::instance().getBuddyInfo(uuid) != NULL))
color = avatar_friend_color;
else if (fs_colorize_lindens && gCacheName->getFullName(uuid, full_name) && LLMuteList::getInstance()->isLinden(full_name))
color = avatar_linden_color;
else if (fs_colorize_firestorm && (fs_data->is_developer(uuid) || fs_data->is_support(uuid)))
color = avatar_firestorm_color;
if (isNonFriend(uuid))
{
color = toneDownColor(color, 0.8f);
}
return color;
}
LLColor4 LGGContactSets::getFriendColor(const LLUUID& friend_id, const std::string& ignoredGroupName)
{
LLColor4 toReturn = getDefaultColor();

View File

@ -53,6 +53,7 @@ public:
void setGroupColor(const std::string& groupName, const LLColor4& color);
LLColor4 getGroupColor(const std::string& groupName);
LLColor4 getFriendColor(const LLUUID& friend_id, const std::string& ignoredGroupName = "");
LLColor4 getSpecialColor(const LLUUID& uuid, const LLColor4& cur_color);
void setDefaultColor(const LLColor4& dColor);
LLColor4 getDefaultColor();

View File

@ -491,8 +491,12 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.BackupDeselectAll", boost::bind(&LLFloaterPreference::onClickDeselectAll, this));
// </FS:Zi>
gSavedSettings.getControl("NameTagShowUsernames")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2));
gSavedSettings.getControl("NameTagShowFriends")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2));
gSavedSettings.getControl("NameTagShowUsernames")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2));
// <FS:CR>
//gSavedSettings.getControl("NameTagShowFriends")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2));
gSavedSettings.getControl("FSColorizeTags")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2));
gSavedSettings.getControl("FSColorizeChat")->getCommitSignal()->connect(boost::bind(&FSFloaterIM::processChatHistoryStyleUpdate, _2));
// </FS:CR>
gSavedSettings.getControl("UseDisplayNames")->getCommitSignal()->connect(boost::bind(&handleDisplayNamesOptionChanged, _2));
// <FS:CR> FIRE-6659: Legacy "Resident" name toggle
gSavedSettings.getControl("DontTrimLegacyNames")->getCommitSignal()->connect(boost::bind(&handleLegacyTrimOptionChanged, _2));

View File

@ -232,9 +232,6 @@ void LLNetMap::draw()
static LLFrameTimer map_timer;
static LLUIColor map_avatar_color = LLUIColorTable::instance().getColor("MapAvatarColor", LLColor4::white);
static LLUIColor map_avatar_friend_color = LLUIColorTable::instance().getColor("MapAvatarFriendColor", LLColor4::white);
static LLUIColor map_avatar_linden_color = LLUIColorTable::instance().getColor("MapAvatarLindenColor", LLColor4::blue);
static LLUIColor map_avatar_muted_color = LLUIColorTable::instance().getColor("MapAvatarMutedColor", LLColor4::grey3);
static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
//static LLUIColor map_track_disabled_color = LLUIColorTable::instance().getColor("MapTrackDisabledColor", LLColor4::white);
static LLUIColor map_frustum_color = LLUIColorTable::instance().getColor("MapFrustumColor", LLColor4::white);
@ -561,14 +558,6 @@ void LLNetMap::draw()
pos_map = globalPosToView(positions[i]);
LLUUID uuid = avatar_ids[i];
// [RLVa:KB] - Checked: 2010-04-19 (RLVa-1.2.0f) | Modified: RLVa-1.2.0f
bool show_as_friend = (LLAvatarTracker::instance().getBuddyInfo(uuid) != NULL) &&
(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
// [/RLVa:KB]
// bool show_as_friend = (LLAvatarTracker::instance().getBuddyInfo(uuid) != NULL);
LLColor4 color = show_as_friend ? map_avatar_friend_color : map_avatar_color;
// <FS:Ansariel> Check for unknown Z-offset => AVATAR_UNKNOWN_Z_OFFSET
//unknown_relative_z = positions[i].mdV[VZ] == COARSEUPDATE_MAX_Z &&
// camera_position.mV[VZ] >= COARSEUPDATE_MAX_Z;
@ -589,22 +578,23 @@ void LLNetMap::draw()
pos_map.mV[VZ] = F32_MAX;
}
}
// </FS:Ansariel>
// Colorize muted avatars and Lindens
std::string fullName;
LLMuteList* muteListInstance = LLMuteList::getInstance();
if (muteListInstance->isMuted(uuid)) color = map_avatar_muted_color;
else if (gCacheName->getFullName(uuid, fullName) && muteListInstance->isLinden(fullName)) color = map_avatar_linden_color;
// </FS:Ansariel>
LLColor4 color = map_avatar_color; // <FS:CR>
// <FS:Ansariel> Mark Avatars with special colors
if (LLNetMap::sAvatarMarksMap.find(uuid) != LLNetMap::sAvatarMarksMap.end())
{
color = LLNetMap::sAvatarMarksMap[uuid];
}
// </FS:Ansariel> Mark Avatars with special colors
// <FS:CR> Color "special" avatars with special colors (Friends, muted, Lindens, etc)
static LLUICachedControl<bool> fs_colorize("FSColorizeMap");
if (fs_colorize)
color = LGGContactSets::getInstance()->getSpecialColor(uuid, color);
// </FS:CR>
//color based on contact sets prefs
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(uuid, LGG_CS_MINIMAP))
{

View File

@ -75,6 +75,13 @@ void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color, bool is_l
{
r_color = LLUIColorTable::instance().getColor("AgentChatColor");
}
// <FS:CR> FIRE-1061 - Color friends, lindens, muted, etc
static LLUICachedControl<bool> fs_colorize("FSColorizeChat");
if (fs_colorize)
r_color = LGGContactSets::getInstance()->getSpecialColor(chat.mFromID, r_color);
// </FS:CR>
//color based on contact sets prefs
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(chat.mFromID, LGG_CS_CHAT))
{

View File

@ -2699,21 +2699,22 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
debugAvatarRezTime("AvatarRezLeftAppearanceNotification","left appearance mode");
}
}
LLColor4 name_tag_color = getNameTagColor(is_friend);
// <FS:CR> Colorize name tags
//LLColor4 name_tag_color = getNameTagColor(is_friend);
LLColor4 name_tag_color = getNameTagColor();
// </FS:CR>
LLColor4 distance_color = name_tag_color;
std::string distance_string;
static LLCachedControl<bool> fsShowOwnTagColor(gSavedSettings, "FSShowOwnTagColor");
if (isSelf() && fsShowOwnTagColor)
{
static LLCachedControl<LLColor4> firestormTagColor(gSavedPerAccountSettings, "FirestormTagColor");
name_tag_color = firestormTagColor;
}
// Wolfspirit: If we don't need to display a friend,
// if we aren't self, if we use colored Clienttags and if we have a color
// then use that color as name_tag_color
static LLUICachedControl<bool> show_friends("NameTagShowFriends");
// <FS:CR> Colorize tags
//static LLUICachedControl<bool> show_friends("NameTagShowFriends");
static LLUICachedControl<bool> colorize_friends("FSColorizeFriends");
static LLUICachedControl<bool> colorize_tags("FSColorizeTags");
bool show_friends = (colorize_friends && colorize_tags);
// </FS:CR>
static LLUICachedControl<U32> color_client_tags("FSColorClienttags");
if(mClientTagData.has("color") && !(show_friends && (is_friend || LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), LGG_CS_TAG))) && color_client_tags > 0 && !this->isSelf())
{
@ -2765,6 +2766,14 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
}
}
// </FS:Ansariel>
// <FS:CR> Colorize tags
static LLCachedControl<bool> fsShowOwnTagColor(gSavedSettings, "FSShowOwnTagColor");
if (isSelf() && fsShowOwnTagColor)
{
static LLCachedControl<LLColor4> firestormTagColor(gSavedPerAccountSettings, "FirestormTagColor");
name_tag_color = firestormTagColor;
}
// </FS:CR>
// Rebuild name tag if state change detected
if (mNameString.empty()
@ -2964,11 +2973,16 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
mNameText->clearString();
LLColor4 new_chat = LLUIColorTable::instance().getColor( isSelf() ? "UserChatColor" : "AgentChatColor" );
//color based on contact sets prefs
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), LGG_CS_CHAT))
{
new_chat = LGGContactSets::getInstance()->getFriendColor(getID());
}
// <FS:CR> Colorize tags
new_chat = LGGContactSets::getInstance()->getSpecialColor(getID(), new_chat);
//color based on contact sets prefs
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), LGG_CS_CHAT))
{
new_chat = LGGContactSets::getInstance()->getFriendColor(getID());
}
// </FS:CR>
if (mVisibleChat)
{
@ -3134,18 +3148,16 @@ void LLVOAvatar::idleUpdateNameTagAlpha(BOOL new_name, F32 alpha)
}
}
LLColor4 LLVOAvatar::getNameTagColor(bool is_friend)
// <FS:CR> Colorize tags
//LLColor4 LLVOAvatar::getNameTagColor(bool is_friend)
LLColor4 LLVOAvatar::getNameTagColor()
// </FS:CR>
{
static LLUICachedControl<bool> show_friends("NameTagShowFriends");
static LLUICachedControl<bool> use_old_color("FSUseV1TagColor");
// ...not using display names
const char* color_name= "NameTagLegacy";
if (show_friends && is_friend)
{
color_name = "NameTagFriend";
}
else if (LLAvatarNameCache::useDisplayNames())
LLColor4 color = LLUIColorTable::getInstance()->getColor("NameTagLegacy");
if (LLAvatarNameCache::useDisplayNames())
{
// ...color based on whether username "matches" a computed display
// name
@ -3153,26 +3165,23 @@ LLColor4 LLVOAvatar::getNameTagColor(bool is_friend)
if (LLAvatarNameCache::get(getID(), &av_name)
&& av_name.mIsDisplayNameDefault)
{
color_name = "NameTagMatch";
color = LLUIColorTable::getInstance()->getColor("NameTagMatch");
}
else
{
color_name = "NameTagMismatch";
color = LLUIColorTable::getInstance()->getColor("NameTagMismatch");
}
}
// <FS:CR> FIRE-1061 - Color friends, lindens, muted, etc
color = LGGContactSets::getInstance()->getSpecialColor(getID(), color);
if (LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), LGG_CS_TAG))
{
return LGGContactSets::getInstance()->getFriendColor(getID());
color = LGGContactSets::getInstance()->getFriendColor(getID());
}
//Wolfspirit: If we don't display a friend, then use "NameTagV1"
if(use_old_color && !(show_friends && is_friend)){
return LLUIColorTable::getInstance()->getColor("NameTagV1");
}
return LLUIColorTable::getInstance()->getColor( color_name );
return color;
}
void LLVOAvatar::idleUpdateBelowWater()

View File

@ -247,7 +247,10 @@ public:
void idleUpdateNameTagText(BOOL new_name);
LLVector3 idleUpdateNameTagPosition(const LLVector3& root_pos_last);
void idleUpdateNameTagAlpha(BOOL new_name, F32 alpha);
LLColor4 getNameTagColor(bool is_friend);
// <FS:CR> Colorize tags
//LLColor4 getNameTagColor(bool is_friend);
LLColor4 getNameTagColor();
// </FS:CR>
void clearNameTag();
static void invalidateNameTag(const LLUUID& agent_id);
// force all name tags to rebuild, useful when display names turned on/off

View File

@ -738,9 +738,12 @@
<color
name="MapAvatarLindenColor"
reference="Blue" />
<color
<color
name="MapAvatarMutedColor"
value="0.4 0.4 0.4 1" />
<color
name="MapAvatarFirestormColor"
reference="Red" />
<color
name="MapFrustumColor"
reference="White_10" />

View File

@ -162,6 +162,66 @@
control="MiniMapObjects" />
</menu_item_check>
<menu_item_separator />
<menu_item_check
label="Colorized Avatars"
name="Colorized Avatars">
<menu_item_check.on_check
function="CheckControl"
parameter="FSColorizeMap" />
<menu_item_check.on_click
function="ToggleControl"
parameter="FSColorizeMap" />
</menu_item_check>
<!-- <menu
label="Colorize..."
name="Colorize"
visibility_control="FSColorizeMap">
<menu_item_check
label="Friends"
name="Friends"
visibility_control="FSColorizeMap">
<menu_item_check.on_check
function="CheckControl"
parameter="FSColorizeFriends" />
<menu_item_check.on_click
function="ToggleControl"
parameter="FSColorizeFriends" />
</menu_item_check>
<menu_item_check
label="Muted"
name="Muted"
visibility_control="FSColorizeMap">
<menu_item_check.on_check
function="CheckControl"
parameter="FSColorizeMuted" />
<menu_item_check.on_click
function="ToggleControl"
parameter="FSColorizeMuted" />
</menu_item_check>
<menu_item_check
label="Lindens"
name="Lindens"
visibility_control="FSColorizeMap">
<menu_item_check.on_check
function="CheckControl"
parameter="FSColorizeLindens" />
<menu_item_check.on_click
function="ToggleControl"
parameter="FSColorizeLindens" />
</menu_item_check>
<menu_item_check
label="Firestorm"
name="Firestorm"
visibility_control="FSColorizeMap">
<menu_item_check.on_check
function="CheckControl"
parameter="FSColorizeFirestorm" />
<menu_item_check.on_click
function="ToggleControl"
parameter="FSColorizeFirestorm" />
</menu_item_check>
</menu>-->
<menu_item_separator />
<menu_item_check
label="Property Lines"
name="Property Lines">

View File

@ -9,123 +9,148 @@
width="540"
label="Colors"
name="colors_panel">
<text
type="string"
length="1"
follows="left|top"
height="15"
layout="topleft"
left="30"
name="effects_color_textbox"
top_pad="10"
width="200">
Selection Effects (Particle Beam):
</text>
<text
type="string"
length="1"
follows="left|top"
layout="topleft"
height="15"
left_delta="200"
name="netmap_color_textbox"
width="100">
Minimap:
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="40"
name="effect_color_swatch"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="EffectColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="EffectColor" />
<color_swatch.caption_text
height="0" />
</color_swatch>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left_delta="200"
name="netmap_chatring_color_swatch"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="MapChatRingColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="MapChatRingColor" />
<color_swatch.caption_text
height="0" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="netmap_chatring_color_label"
top_delta="5"
width="95">
Chat range
</text>
<color_swatch
can_apply_immediately="true"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left_delta="100"
top_pad="-15"
name="netmap_shoutring_color_swatch"
tool_tip="Click to open Color Picker"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="MapShoutRingColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="MapShoutRingColor" />
<color_swatch.caption_text
height="0" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="netmap_shoutring_color_label"
top_delta="5"
width="95">
Shout range
</text>
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="font_colors"
top_pad="15"
width="120">
UI Text Colors:
</text>
<color_swatch
<tab_container
label="Color Prefs"
layout="topleft"
follows="all"
top="5"
bottom="-10"
left="1"
right="-1"
name="tabs"
tab_min_width="50"
tab_position="top" >
<panel
top_pad="5"
bottom="-1"
left="1"
right="-1"
follows="all"
label="General"
name="tab-general" >
<text
type="string"
length="1"
follows="left|top"
height="15"
layout="topleft"
left="30"
name="effects_color_textbox"
top_pad="10"
width="200">
Selection Effects (Particle Beam):
</text>
<text
type="string"
length="1"
follows="left|top"
layout="topleft"
height="15"
left_delta="200"
name="netmap_color_textbox"
width="100">
Minimap:
</text>
<color_swatch
can_apply_immediately="true"
color="EffectColor"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="40"
name="effect_color_swatch"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="EffectColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="EffectColor" />
<color_swatch.caption_text
height="0" />
</color_swatch>
<color_swatch
can_apply_immediately="true"
color="MapChatRingColor"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left_delta="200"
name="netmap_chatring_color_swatch"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="MapChatRingColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="MapChatRingColor" />
<color_swatch.caption_text
height="0" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="netmap_chatring_color_label"
top_delta="5"
width="95">
Chat range
</text>
<color_swatch
can_apply_immediately="true"
color="MapShoutRingColor"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left_delta="100"
top_pad="-15"
name="netmap_shoutring_color_swatch"
tool_tip="Click to open Color Picker"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="MapShoutRingColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="MapShoutRingColor" />
<color_swatch.caption_text
height="0" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="netmap_shoutring_color_label"
top_delta="5"
width="95">
Shout range
</text>
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="font_colors"
top_pad="15"
width="120">
UI Colors:
</text>
<color_swatch
can_apply_immediately="true"
color="UserChatColor"
follows="left|top"
height="24"
label_height="0"
@ -152,10 +177,11 @@
name="text_box1"
top_delta="5"
width="95">
My text
Me
</text>
<color_swatch
can_apply_immediately="true"
color="AgentChatColor"
follows="left|top"
height="24"
label_height="0"
@ -408,80 +434,111 @@
Chat Headers
</text>
<color_swatch
can_apply_immediately="true"
color="MapAvatarFriendColor"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="40"
name="owner"
top_pad="19"
width="44" >
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="MapAvatarFriendColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="MapAvatarFriendColor" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="friends_text"
top_delta="5"
width="95">
Friends
</text>
<color_swatch
can_apply_immediately="true"
color="MapAvatarLindenColor"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="190"
name="links"
top_pad="-15"
width="44" >
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="MapAvatarLindenColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="MapAvatarLindenColor" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="lindens_text"
top_delta="5"
width="95">
Lindens
</text>
<color_swatch
can_apply_immediately="true"
color="MapAvatarFirestormColor"
follows="left|top"
height="24"
label_height="0"
label_width="60"
layout="topleft"
left="360"
name="FirestormColor"
top_pad="-15"
width="44">
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="MapAvatarFirestormColor" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="MapAvatarFirestormColor" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="firestorm_text"
top_delta="5"
width="110">
Firestorm
</text>
<color_swatch
can_apply_immediately="true"
color="DialogColorBg"
color="DirectChatColor"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="40"
name="DialogColorBg"
name="direct"
top_pad="19"
width="44" >
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="ScriptDialog" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="ScriptDialog" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="ScriptDialogBgLabel"
top_delta="5"
width="95">
Script Dialog Bg
</text>
<color_swatch
can_apply_immediately="true"
color="DialogColorFg"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="190"
name="ScriptDialogFb"
top_pad="-15"
width="44" >
<color_swatch.init_callback
function="Pref.getUIColor"
parameter="ScriptDialogFg" />
<color_swatch.commit_callback
function="Pref.applyUIColor"
parameter="ScriptDialogFg" />
</color_swatch>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="ScriptDialogFgLabel"
top_delta="5"
width="95">
Script Dialog Fg
</text>
<color_swatch
can_apply_immediately="true"
color="LtOrange"
follows="left|top"
height="24"
label_height="0"
layout="topleft"
left="360"
name="direct"
top_pad="-15"
width="44" >
<color_swatch.init_callback
function="Pref.getUIColor"
@ -498,19 +555,19 @@
layout="topleft"
left_pad="5"
mouse_opaque="false"
name="text_box10"
name="DirectChatColor"
top_delta="5"
width="95">
Direct
</text>
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="bubble_chat"
top_pad="25"
top_pad="14"
width="450">
Name Tag / Bubble Chat / Console Opacity:
</text>
@ -548,75 +605,6 @@
tool_tip="Choose name tag opacity"
top_delta = "6"
width="378" />
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="floater_opacity"
top_pad="15"
width="220">
Floating Window Opacity:
</text>
<slider
can_edit_text="false"
control_name="ActiveFloaterTransparency"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="1.0"
layout="topleft"
label_width="115"
label="Active:"
left="50"
max_val="1.00"
min_val="0.00"
name="active"
show_text="true"
top_pad="5"
width="415" />
<slider
can_edit_text="false"
control_name="InactiveFloaterTransparency"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0.5"
layout="topleft"
label_width="115"
label="Inactive:"
left="50"
max_val="1.00"
min_val="0.00"
name="inactive"
show_text="true"
top_pad="2"
width="415" />
<check_box
control_name="FSScriptDialogNoTransparency"
follows="left|top"
layout="topleft"
left="30"
height="12"
name="FSScriptDialogNoTransparency"
top_pad="10"
width="450"
label="Show script dialogs always on opaque background" />
<check_box
control_name="FSGroupNotifyNoTransparency"
follows="left|top"
layout="topleft"
left="30"
height="12"
name="FSGroupNotifyNoTransparency"
top_pad="5"
width="450"
label="Show group notices always on opaque background" />
<!-- ## Zi: Pie menu -->
<check_box
control_name="OverridePieColors"
@ -694,4 +682,167 @@
top_pad="2"
width="330" />
<!-- ## Zi: Pie menu -->
</panel>
<panel
top_pad="5"
bottom="-1"
left="1"
right="-1"
follows="all"
label="Misc"
name="tab-misc" >
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="floater_opacity"
top_pad="10"
width="220">
Floating Window Opacity:
</text>
<slider
can_edit_text="false"
control_name="ActiveFloaterTransparency"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="1.0"
layout="topleft"
label_width="115"
label="Active:"
left="50"
max_val="1.00"
min_val="0.00"
name="active"
show_text="true"
top_pad="5"
width="415" />
<slider
can_edit_text="false"
control_name="InactiveFloaterTransparency"
decimal_digits="2"
follows="left|top"
height="16"
increment="0.01"
initial_value="0.5"
layout="topleft"
label_width="115"
label="Inactive:"
left="50"
max_val="1.00"
min_val="0.00"
name="inactive"
show_text="true"
top_pad="2"
width="415" />
<text
follows="left|top"
layout="topleft"
left="30"
height="12"
name="colorize_options"
top_pad="10"
width="220">
Avatar Coloring:
</text>
<check_box
control_name="FSColorizeChat"
follows="left|top"
layout="topleft"
left_delta="14"
top="85"
height="20"
name="FSColorizeChat"
width="450"
label="Colorize chat based on avatar" />
<check_box
control_name="FSColorizeTags"
follows="left|top"
layout="topleft"
top_pad="0"
height="20"
name="FSColorizeTags"
width="450"
label="Colorize nametags based on avatar" />
<check_box
control_name="FSColorizeMap"
follows="left|top"
layout="topleft"
top_pad="0"
height="20"
name="FSColorizeMap"
width="450"
label="Colorize mini-map based on avatar" />
<check_box
control_name="FSColorizeSelf"
follows="left|top"
layout="topleft"
left="280"
top="85"
height="20"
name="FSColorizeSelf"
width="450"
label="Colorize self" />
<check_box
control_name="FSColorizeFriends"
follows="left|top"
layout="topleft"
top_pad="0"
height="20"
name="FSColorizeFriends"
width="450"
label="Colorize friends" />
<check_box
control_name="FSColorizeMuted"
follows="left|top"
layout="topleft"
top_pad="0"
height="20"
name="FSColorizeMuted"
width="450"
label="Colorize muted avatars" />
<check_box
control_name="FSColorizeLindens"
follows="left|top"
layout="topleft"
top_pad="0"
height="20"
name="FSColorizeLindens"
width="450"
label="Colorize Lindens" />
<check_box
control_name="FSColorizeFirestorm"
follows="left|top"
layout="topleft"
top_pad="0"
height="20"
name="FSColorizeFirestorm"
width="450"
label="Colorize Firestorm team" />
<check_box
control_name="FSScriptDialogNoTransparency"
follows="left|top"
layout="topleft"
left="30"
height="12"
name="FSScriptDialogNoTransparency"
top_pad="24"
width="450"
label="Show script dialogs always on opaque background" />
<check_box
control_name="FSGroupNotifyNoTransparency"
follows="left|top"
layout="topleft"
height="12"
name="FSGroupNotifyNoTransparency"
top_pad="5"
width="450"
label="Show group notices always on opaque background" />
</panel>
</tab_container>
</panel>