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

Client definitions were mucked with to poke Emerald.

Browse Source 
People complained about the color of Friends in the avatar list, so I started adding support to change that (And made it account-specific as all the color stuff is designed to be). Didn't finish it, though.
The windlight popup is still broke as fuck when you start up, opening and closing it fixes it but no amount of basic common sense fixes it.
Changes to the client definitions to try to add our own colors worked, but the definitions file fucked off in the process so the client ID thing is sort of broken. Rather than trying to fix it, I think we'll just move onto the method described by Hazim/Zwagoth, which was closer to what we'd been trying to develop. I propose we just make people show up as Ascent and remove the tag reporting, honestly.
This commit is contained in:
Beeks
2010-09-02 22:10:56 -04:00
parent 800777f750
commit d9cf8144e4
13 changed files with 310 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
indra/newview/app_settings/client_definitions.xml
View File

@@ -98,38 +98,13 @@
<key>name</key>
<string>Day Oh proxy</string>
</map>
<key>emeraldTags</key>
<map>
<key>Blue</key>
<string>4eb67510-0924-ebb1-50ca-8af5694cd267</string>
<key>Default</key>
<string>bf33bd15-7020-cce1-3725-48923440b7ee</string>
<key>Fuchsia</key>
<string>e4117c3f-cc02-d537-665d-c31b8c11bb18</string>
<key>Green</key>
<string>ccda2b3b-e72c-a112-e126-fee238b67218</string>
<key>Orange</key>
<string>e741e2bf-cf8c-191c-97f2-b2709a843dfc</string>
<key>Pink</key>
<string>072343d0-1ce9-0952-4106-5312af4a789a</string>
<key>Purple</key>
<string>0ae2f973-98c1-a4e8-9f4b-9db2044ab079</string>
<key>Red</key>
<string>1da8eb54-a70f-bd4a-77e5-c7b815c3b2a2</string>
<key>Violet</key>
<string>602243f4-8fb1-ac00-d5bc-7ab50c4433b7</string>
<key>White</key>
<string>1e0948ab-706a-b309-434c-a694436a79be</string>
<key>Yellow</key>
<string>8078ffb3-840c-d037-caf3-5cd02c2e7040</string>
</map>
<key>072343d0-1ce9-0952-4106-5312af4a789a</key>
<map>
<key>color</key>
<array>
<real>2</real>
<real>1</real>
<real>1.6000000000000001</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>
@@ -141,9 +116,9 @@
<map>
<key>color</key>
<array>
<real>1.2</real>
<real>0.40000000000000002</real>
<real>1.6000000000000001</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>
@@ -155,9 +130,9 @@
<map>
<key>color</key>
<array>
<real>2</real>
<real>0</real>
<real>0</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>
@@ -169,9 +144,9 @@
<map>
<key>color</key>
<array>
<real>2</real>
<real>2</real>
<real>2</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>
@@ -183,9 +158,9 @@
<map>
<key>color</key>
<array>
<real>0.34999999999999998</real>
<real>0.34999999999999998</real>
<real>2</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>
@@ -197,9 +172,9 @@
<map>
<key>color</key>
<array>
<real>0.5</real>
<real>0</real>
<real>2</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>
@@ -211,9 +186,9 @@
<map>
<key>color</key>
<array>
<real>2</real>
<real>2</real>
<real>0</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>
@@ -239,9 +214,9 @@
<map>
<key>color</key>
<array>
<real>0</real>
<real>2</real>
<real>0</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>
@@ -253,9 +228,9 @@
<map>
<key>color</key>
<array>
<real>2</real>
<real>0</real>
<real>2</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>
@@ -267,9 +242,9 @@
<map>
<key>color</key>
<array>
<real>2</real>
<real>0.5</real>
<real>0</real>
<real>0.97999999999999998</real>
<real>0.68999999999999995</real>
<real>0.34000000000000002</real>
<real>1</real>
</array>
<key>multiple</key>

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

@@ -748,7 +748,71 @@
<integer>1</integer>
</map>
<!-- Ascent's Optionally Account-Specific Settings -->
<key>AscentSpoofClientIndex</key>
<key>AscentFriendColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>1.0</real>
<real>0.0</real>
<real>1.0</real>
</array>
</map>
<key>AscentLindenColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.0</real>
<real>0.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</map>
<key>AscentMutedColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.7</real>
<real>0.7</real>
<real>0.7</real>
<real>1.0</real>
</array>
</map>
<key>AscentEstateOwnerColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>0.6</real>
<real>1.0</real>
<real>1.0</real>
</array>
</map>
<key>AscentReportClientIndex</key>
<map>
<key>Comment</key>
<string>Show your own tag</string>
@@ -759,7 +823,7 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentSpoofClientUUID</key>
<key>AscentReportClientUUID</key>
<map>
<key>Comment</key>
<string>Broadcasted Client Key</string>

68
indra/newview/app_settings/settings_per_account.xml
View File

@@ -14,6 +14,70 @@
</array>
</map>
<!-- Ascent Account-Specific (If active) -->
<key>AscentFriendColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>1.0</real>
<real>0.0</real>
<real>1.0</real>
</array>
</map>
<key>AscentLindenColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.0</real>
<real>0.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</map>
<key>AscentMutedColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.7</real>
<real>0.7</real>
<real>0.7</real>
<real>1.0</real>
</array>
</map>
<key>AscentEstateOwnerColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>0.6</real>
<real>1.0</real>
<real>1.0</real>
</array>
</map>
<key>AscentUseCustomTag</key>
<map>
<key>Comment</key>
@@ -52,7 +116,7 @@
<key>Value</key>
<string>Custom</string>
</map>
<key>AscentSpoofClientIndex</key>
<key>AscentReportClientIndex</key>
<map>
<key>Comment</key>
<string>Show your own tag</string>
@@ -63,7 +127,7 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentSpoofClientUUID</key>
<key>AscentReportClientUUID</key>
<map>
<key>Comment</key>
<string>Broadcasted Client Key</string>

24
indra/newview/ascentprefsvan.cpp
View File

@@ -81,12 +81,20 @@ LLPrefsAscentVanImpl::LLPrefsAscentVanImpl()
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
childSetCommitCallback("use_account_settings_check", onCommitCheckBox, this);
childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this);
childSetCommitCallback("X Modifier", LLPrefsAscentVan::onCommitUpdateAvatarOffsets);
childSetCommitCallback("Y Modifier", LLPrefsAscentVan::onCommitUpdateAvatarOffsets);
childSetCommitCallback("Z Modifier", LLPrefsAscentVan::onCommitUpdateAvatarOffsets);
refresh();
}
void LLPrefsAscentVan::onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata)
{
gAgent.sendAgentSetAppearance();
//llinfos << llformat("%d,%d,%d",gSavedSettings.getF32("EmeraldAvatarXModifier"),gSavedSettings.getF32("EmeraldAvatarYModifier"),gSavedSettings.getF32("EmeraldAvatarZModifier")) << llendl;
}
//static
void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
{
@@ -129,7 +137,7 @@ void LLPrefsAscentVanImpl::refreshValues()
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{
mSelectedClient = gSavedSettings.getU32("AscentSpoofClientIndex");
mSelectedClient = gSavedSettings.getU32("AscentReportClientIndex");
mEffectColor = gSavedSettings.getColor4("EffectColor");
if (gSavedSettings.getBOOL("AscentUseCustomTag"))
{
@@ -150,7 +158,7 @@ void LLPrefsAscentVanImpl::refreshValues()
}
else
{
mSelectedClient = gSavedPerAccountSettings.getU32("AscentSpoofClientIndex");
mSelectedClient = gSavedPerAccountSettings.getU32("AscentReportClientIndex");
mEffectColor = gSavedPerAccountSettings.getColor4("EffectColor");
if (gSavedPerAccountSettings.getBOOL("AscentUseCustomTag"))
{
@@ -256,13 +264,15 @@ void LLPrefsAscentVanImpl::apply()
client_uuid = combo->getSelectedValue().asString();
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{
gSavedSettings.setString("AscentSpoofClientUUID", client_uuid);
gSavedSettings.setU32("AscentSpoofClientIndex", client_index);
llinfos << "Setting texture to: " << client_uuid << llendl;
gSavedSettings.setString("AscentReportClientUUID", client_uuid);
gSavedSettings.setU32("AscentReportClientIndex", client_index);
}
else
{
gSavedPerAccountSettings.setString("AscentSpoofClientUUID", client_uuid);
gSavedPerAccountSettings.setU32("AscentSpoofClientIndex", client_index);
llinfos << "Setting texture to: " << client_uuid << llendl;
gSavedPerAccountSettings.setString("AscentReportClientUUID", client_uuid);
gSavedPerAccountSettings.setU32("AscentReportClientIndex", client_index);
}
LLVOAvatar* avatar = gAgent.getAvatarObject();
if (!avatar) return;

7
indra/newview/ascentprefsvan.h
View File

@@ -32,6 +32,8 @@
#ifndef ASCENTPREFSVAN_H
#define ASCENTPREFSVAN_H
#include "llpanel.h"
class LLPanel;
class LLPrefsAscentVanImpl;
@@ -46,8 +48,13 @@ public:
LLPanel* getPanel();
static void onCommitUpdateAvatarOffsets(LLUICtrl* ctrl, void* userdata);
protected:
LLPrefsAscentVanImpl& impl;
private:
};
#endif

12
indra/newview/llagent.cpp
View File

@@ -1971,7 +1971,7 @@ void LLAgent::cameraOrbitIn(const F32 meters)
mCameraZoomFraction = (mTargetCameraDistance - meters) / camera_offset_dist;
if (!LLAppViewer::sFreezeTime && mCameraZoomFraction < MIN_ZOOM_FRACTION && meters > 0.f)
if (!gSavedSettings.getF32("FreezeTime") && mCameraZoomFraction < MIN_ZOOM_FRACTION && meters > 0.f)
{
// No need to animate, camera is already there.
changeCameraToMouselook(FALSE);
@@ -3705,7 +3705,7 @@ F32 LLAgent::calcCameraFOVZoomFactor()
LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
{
// Compute base camera position and look-at points.
F32 camera_land_height;
//F32 camera_land_height;
LLVector3d frame_center_global = mAvatarObject.isNull() ? getPositionGlobal()
: getPosGlobalFromAgent(mAvatarObject->mRoot.getWorldPosition());
@@ -7492,13 +7492,13 @@ void LLAgent::sendAgentSetAppearance()
msg->nextBlockFast(_PREHASH_ObjectData);
// Tag changing support
if (!gSavedSettings.controlExists("AscentSpoofClientUUID"))
if (!gSavedSettings.controlExists("AscentReportClientUUID"))
{
gSavedSettings.declareString("AscentSpoofClientUUID", "8873757c-092a-98fb-1afd-ecd347566fcd", "FAKIN' BAKE-IN");
gSavedSettings.setString("AscentSpoofClientUUID", "8873757c-092a-98fb-1afd-ecd347566fcd");
gSavedSettings.declareString("AscentReportClientUUID", "8873757c-092a-98fb-1afd-ecd347566fcd", "FAKIN' BAKE-IN");
gSavedSettings.setString("AscentReportClientUUID", "8873757c-092a-98fb-1afd-ecd347566fcd");
}
mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentSpoofClientUUID") );
mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentReportClientUUID") );
}
else
{

33
indra/newview/llfloateravatarlist.cpp
View File

@@ -627,6 +627,7 @@ void LLFloaterAvatarList::refreshAvatarList()
{
LLSD element;
LLUUID av_id;
std::string av_name;
LLAvatarListEntry *entry = &iter->second;
@@ -637,6 +638,7 @@ void LLFloaterAvatarList::refreshAvatarList()
}
av_id = entry->getID();
av_name = entry->getName().c_str();
LLVector3d position = entry->getPosition();
BOOL UnknownAltitude = false;
@@ -686,13 +688,14 @@ void LLFloaterAvatarList::refreshAvatarList()
element["columns"][LIST_AVATAR_NAME]["column"] = "avatar_name";
element["columns"][LIST_AVATAR_NAME]["type"] = "text";
element["columns"][LIST_AVATAR_NAME]["value"] = entry->getName().c_str();
element["columns"][LIST_AVATAR_NAME]["value"] = av_name;
if (entry->isFocused())
{
element["columns"][LIST_AVATAR_NAME]["font-style"] = "BOLD";
}
//<edit> custom colors for certain types of avatars!
//Changed a bit so people can modify them in settings. And since they're colors, again it's possibly account-based. Starting to think I need a function just to determine that. - HgB
//element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "MapAvatar" ).getValue();
LLViewerRegion* parent_estate = LLWorld::getInstance()->getRegionFromPosGlobal(entry->getPosition());
LLUUID estate_owner = LLUUID::null;
@@ -702,26 +705,38 @@ void LLFloaterAvatarList::refreshAvatarList()
}
//Lindens are always more Linden than your friend, make that take precedence
if(LLMuteList::getInstance()->isLinden(entry->getName()))
if(LLMuteList::getInstance()->isLinden(av_name))
{
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "MapLinden" ).getValue();
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedSettings.getColor4("AscentLindenColor").getValue();
else
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedPerAccountSettings.getColor4("AscentLindenColor").getValue();
}
//first make sure their parent estate actually still exists and is alive, and yes, I am lazy.
//check if they are an estate owner at their current position
else if(estate_owner.notNull() && av_id == estate_owner)
{
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "MapEstateOwner" ).getValue();
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedSettings.getColor4("AscentEstateOwnerColor").getValue();
else
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedPerAccountSettings.getColor4("AscentEstateOwnerColor").getValue();
}
//without these people, SL would suck.
//without these dots, SL would suck.
else if(is_agent_friend(av_id))
{
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "MapFriend" ).getValue();
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
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.
else if(LLMuteList::getInstance()->isMuted(av_id))
{
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "MapMuted" ).getValue();
if (gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedSettings.getColor4("AscentMutedColor").getValue();
else
element["columns"][LIST_AVATAR_NAME]["color"] = gSavedPerAccountSettings.getColor4("AscentMutedColor").getValue();
}
//</edit>
char temp[32];
LLColor4 color = LLColor4::black;

20
indra/newview/llnetmap.cpp
View File

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

168
indra/newview/llvoavatar.cpp
View File

@@ -3341,7 +3341,8 @@ bool LLVOAvatar::loadClientTags()
if(client_list.has("isComplete"))
{
sClientResolutionList = client_list;
}else
}
else
{
return false;
}
@@ -3383,11 +3384,11 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
}
else if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{
uuid_str = gSavedSettings.getString("AscentSpoofClientUUID");
uuid_str = gSavedSettings.getString("AscentReportClientUUID");
}
else
{
uuid_str = gSavedPerAccountSettings.getString("AscentSpoofClientUUID");
uuid_str = gSavedPerAccountSettings.getString("AscentReportClientUUID");
}
}
if(getTEImage(TEX_HEAD_BODYPAINT)->getID() == IMG_DEFAULT_AVATAR)
@@ -3445,8 +3446,16 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
color = LLColor4(0.5f, 0.0f, 0.0f);
client = "Unknown";
}
if (mIsSelf)
{
if (LLVOAvatar::sClientResolutionList.has("isComplete"))
llinfos << "XML Loaded with " << LLVOAvatar::sClientResolutionList.size() << " entries (?), checking UUID" << uuid_str << llendl;
if (LLVOAvatar::sClientResolutionList.has(uuid_str))
llinfos << "Found UUID" << llendl;
}
else if (LLVOAvatar::sClientResolutionList.has("isComplete") && LLVOAvatar::sClientResolutionList.has(uuid_str))
{
LLSD cllsd = LLVOAvatar::sClientResolutionList[uuid_str];
client = cllsd["name"].asString();
LLColor4 colour;
@@ -3505,159 +3514,6 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
}
}
LLColor4 LLVOAvatar::getTagColorByUUID(std::string uuid_str)
{
if (uuid_str == "0bcd5f5d-a4ce-9ea4-f9e8-15132653b3d8")
{
return LLColor4(1.0f, 0.3f, 0.5f);
//client = "MoyMix";
}
else if (uuid_str == "5855f37d-63e5-3918-1404-8ffa3820eb6d")
{
return LLColor4(1.0f, 0.3f, 0.5f);
//client = "MoyMix/B";
}
else if (uuid_str == "9ba526b6-f43d-6b60-42de-ce62a25ee7fb")
{
return LLColor4(1.0f, 0.3f, 0.5f);
//client = "MoyMix/nolife";
}
else if (uuid_str == "0f6723d2-5b23-6b58-08ab-308112b33786")
{
return LLColor4(0.5f, 0.75f, 1.0f);
//client = "CryoLife";
}
else if (uuid_str == "2c9c1e0b-e5d1-263e-16b1-7fc6d169f3d6")
{
return LLColor4(0.5f, 0.75f, 1.0f);
//client = "Phoxy SL";
}
else if (uuid_str == "c252d89d-6f7c-7d90-f430-d140d2e3fbbe")
{
return LLColor4(0.7f, 0.7f, 0.7f);
//client = "VLife";
}
else if (uuid_str == "5aa5c70d-d787-571b-0495-4fc1bdef1500")
{
return LLColor4(1.f, 0.0f, 0.0f);
//client = "GridProxy/LordGregGreg";
}
else if (uuid_str == "8183e823-c443-2142-6eb6-2ab763d4f81c")
{
return LLColor4(1.f, 1.f, 0.0f);
//client = "GridProxy/DayOh";
}
else if (uuid_str == "f3fd74a6-fee7-4b2f-93ae-ddcb5991da04")
{
return LLColor4(1.0f, 0.0f, 1.0f);
//client = "PSL/A";
}
else if (uuid_str == "77662f23-c77a-9b4d-5558-26b757b2144c")
{
return LLColor4(1.0f, 0.0f, 1.0f);
//client = "PSL/B";
}
else if (uuid_str == "1c29480c-c608-df87-28bb-964fb64c5366")
{
return LLColor4(1.f, 1.0f, 1.0f);
//client = "Emerald/GEMINI";
}
else if (uuid_str == "e6f9c019-8783-dc3e-b265-41f1510333fc")
{
return LLColor4(0.4f,0.4f,0.4f);
//client = "Onyx";
}
else if (uuid_str == "5262d71a-88f7-ef40-3b15-00ea148ab4b5")
{
return LLColor4(0.9f, 0.9f, 0.9f);
//client = "GEMINI Bot";
}
else if (uuid_str == "adcbe893-7643-fd12-f61c-0b39717e2e32")
{
return LLColor4(1.0f, 0.5f, 0.4f);
//client = "tyk3n";
}
else if (uuid_str == "f5a48821-9a98-d09e-8d6a-50cc08ba9a47")
{
return gColors.getColor( "AvatarNameColor" );
//client = "NeilLife";
}
else if (uuid_str == "cc7a030f-282f-c165-44d2-b5ee572e72bf")
{
return LLColor4::purple;
//client = "Imprudence";
}
else if (uuid_str == "380ae30b-f2c7-b07c-041e-5688e89a6fc1")
{
return LLColor4(0.65f, 0.93f, 0.14f);
//client = "Nano";
}
else if (uuid_str == "c58fca06-33b3-827d-d81c-a886a631affc")
{
return LLColor4(1.0f,0.61176f,0.0f);
//client = "Whale";
}
else if (uuid_str == "872c0005-3095-0967-866d-11cd71115c22")
{
return LLColor4(0.25f,0.5f,0.75f);
//client = "<-- Fag";
}
else if (uuid_str == "00000000-0000-0000-0000-000000000000")
{
return LLColor4(0.5f, 0.5f, 0.5f);
//client = "Viewer 2.0";
}
else if (uuid_str == "734fed29-4c51-63e5-1648-6589949d7585")
{
return LLColor4(0.60000f, 0.42745f, 0.80784f);
//client = "Explicit";
}
else if (uuid_str == "8873757c-092a-98fb-1afd-ecd347566fcd")
{
return LLColor4(0.375f, 1.0f, 1.0f);
//client = "Ascent";
}
return gColors.getColor( "AvatarNameColor" );
}
void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
{
// update chat bubble

1
indra/newview/llvoavatar.h
View File

@@ -95,7 +95,6 @@ public:
// <edit>
void getClientInfo(std::string& clientTag, LLColor4& tagColor, BOOL useComment=FALSE);
LLColor4 getTagColorByUUID(std::string uuid_str);
std::string extraMetadata;
// </edit>

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

@@ -371,32 +371,35 @@
width="400" />
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Building" name="Building">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="10" left_delta="30" mouse_opaque="false"
name="text_box6" v_pad="0" width="150"> Pivot Point</text>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
label="X pos" label_width="40" left="10" mouse_opaque="true" max_val="256"
min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
label="Y pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
label="Z pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Values are percent" left_delta="-5" mouse_opaque="true" tool_tip="Default settings are Percentages and every axis set at 50"
name="EmPivotPercToggle" radio_style="false" width="100" control_name="AscentBuildPrefs_PivotIsPercent"/>
<check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Enable highlighting of selected prims" left_delta="140"
mouse_opaque="true" name="EmBuildPrefsRenderHighlight_toggle" control_name="AscentRenderHighlightSelections"
radio_style="false" width="270"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Show axis arrow on root prim position" left_delta="0"
mouse_opaque="true" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead."
name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"
radio_style="false" width="270"/>
follows="left|top|right|bottom" label="Building" name="Building">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-19" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="10" left_delta="30" mouse_opaque="false"
name="text_box6" v_pad="0" width="150">
Pivot Point
</text>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
label="X pos" label_width="40" left="10" mouse_opaque="true" max_val="256"
min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
label="Y pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
label="Z pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Values are percent" left_delta="-5" mouse_opaque="true"
tool_tip="Default settings are Percentages and every axis set at 50"
name="EmPivotPercToggle" radio_style="false" width="100" control_name="AscentBuildPrefs_PivotIsPercent"/>
<check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Enable highlighting of selected prims" left_delta="140"
mouse_opaque="true" name="EmBuildPrefsRenderHighlight_toggle" control_name="AscentRenderHighlightSelections"
radio_style="false" width="270"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Show axis arrow on root prim position" left_delta="0"
mouse_opaque="true" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead."
name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"
radio_style="false" width="270"/>
</panel>
</tab_container>
</panel>

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

@@ -28,53 +28,56 @@
bottom_delta="-28" height="18" hidden="false" left_delta="0" max_chars="20" mouse_opaque="true"
tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color."
name="tag_spoofing_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="Ascent" value="8873757c-092a-98fb-1afd-ecd347566fcd">
<combo_item type="string" length="1" enabled="true" name="Ascent"
value="8873757c-092a-98fb-1afd-ecd347566fcd">
Ascent
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Explicit" value="734fed29-4c51-63e5-1648-6589949d7585">
<combo_item type="string" length="1" enabled="true" name="Explicit"
value="734fed29-4c51-63e5-1648-6589949d7585">
Explicit
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (Standard)"
value="ccda2b3b-e72c-a112-e126-fee238b67218">
Emerald (Standard)
<combo_item type="string" length="1" enabled="true" name="Blue"
value="424ff131-0a2d-6e26-1349-95155a883623">
Blue
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (Blue)"
value="4eb67510-0924-ebb1-50ca-8af5694cd267">
Emerald (Blue)
<combo_item type="string" length="1" enabled="true" name="Fuschia"
value="730f719f-2922-2028-cc7a-ba98894e8288">
Fuschia
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (Fuschia)"
value="e4117c3f-cc02-d537-665d-c31b8c11bb18">
Emerald (Fuschia)
<combo_item type="string" length="1" enabled="true" name="Standard"
value="907b0318-fa09-2960-66c3-6044dc6f1e21">
Green
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (Orange)"
value="e741e2bf-cf8c-191c-97f2-b2709a843dfc">
Emerald (Orange)
<combo_item type="string" length="1" enabled="true" name="Orange"
value="585f11b5-985a-1f3b-5457-4a282a5024a3">
Orange
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (Pink)"
value="072343d0-1ce9-0952-4106-5312af4a789a">
Emerald (Pink)
<combo_item type="string" length="1" enabled="true" name="Pink"
value="544c1f14-74d0-f4b4-69c0-ddf12e0a5078">
Pink
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (Purple)"
value="0ae2f973-98c1-a4e8-9f4b-9db2044ab079">
Emerald (Purple)
<combo_item type="string" length="1" enabled="true" name="Purple"
value="ef3e515f-8cb5-d0de-5520-05cea50eebb4">
Purple
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (Red)"
value="1da8eb54-a70f-bd4a-77e5-c7b815c3b2a2">
Emerald (Red)
<combo_item type="string" length="1" enabled="true" name="Red"
value="40bc938e-7e9b-fe67-487f-033c964e91c2">
Red
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (Violet)"
value="602243f4-8fb1-ac00-d5bc-7ab50c4433b7">
Emerald (Violet)
<combo_item type="string" length="1" enabled="true" name="Violet"
value="8ec4dbe2-8eba-9acb-9b7f-c46c2bf32815">
Violet
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (White)"
value="1e0948ab-706a-b309-434c-a694436a79be">
Emerald (White)
<combo_item type="string" length="1" enabled="true" name="White"
value="22babd8a-4a38-37a1-0ad2-222d3c71fab6">
White
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Emerald (Yellow)"
value="8078ffb3-840c-d037-caf3-5cd02c2e7040">
Emerald (Yellow)
<combo_item type="string" length="1" enabled="true" name="Yellow"
value="d9670636-239c-1d1b-fd5b-8b1c7833a669">
Yellow
</combo_item>
<combo_item type="string" length="1" enabled="true" name="Hide Tag" value="c228d1cf-4b5d-4ba8-84f4-899a0796aa97">
<combo_item type="string" length="1" enabled="true" name="Hide Tag"
value="c228d1cf-4b5d-4ba8-84f4-899a0796aa97">
Hide Tag
</combo_item>
</combo_box>

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

@@ -135,7 +135,7 @@
label="Show script errors and warnings as regular chat" left="148"
mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
width="275" />
<check_box bottom_delta="-20" enabled="true"
<check_box bottom_delta="-20" enabled="true" control_name="PlayTypingAnim"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play typing animation when chatting" left="148" mouse_opaque="true"
name="play_typing_animation" radio_style="false" width="237" />