From d9cf8144e488bc926c65a1c82e56ae0ee3e22bc9 Mon Sep 17 00:00:00 2001 From: Beeks Date: Thu, 2 Sep 2010 22:10:56 -0400 Subject: [PATCH] Client definitions were mucked with to poke Emerald. 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. --- .../app_settings/client_definitions.xml | 85 ++++----- indra/newview/app_settings/settings.xml | 68 ++++++- .../app_settings/settings_per_account.xml | 68 ++++++- indra/newview/ascentprefsvan.cpp | 24 ++- indra/newview/ascentprefsvan.h | 7 + indra/newview/llagent.cpp | 12 +- indra/newview/llfloateravatarlist.cpp | 33 +++- indra/newview/llnetmap.cpp | 20 ++- indra/newview/llvoavatar.cpp | 168 ++---------------- indra/newview/llvoavatar.h | 1 - .../en-us/panel_preferences_ascent_system.xml | 55 +++--- .../en-us/panel_preferences_ascent_vanity.xml | 69 +++---- .../xui/en-us/panel_preferences_chat.xml | 2 +- 13 files changed, 310 insertions(+), 302 deletions(-) diff --git a/indra/newview/app_settings/client_definitions.xml b/indra/newview/app_settings/client_definitions.xml index 004c63002..8c44fa709 100644 --- a/indra/newview/app_settings/client_definitions.xml +++ b/indra/newview/app_settings/client_definitions.xml @@ -98,38 +98,13 @@ name Day Oh proxy - emeraldTags - - Blue - 4eb67510-0924-ebb1-50ca-8af5694cd267 - Default - bf33bd15-7020-cce1-3725-48923440b7ee - Fuchsia - e4117c3f-cc02-d537-665d-c31b8c11bb18 - Green - ccda2b3b-e72c-a112-e126-fee238b67218 - Orange - e741e2bf-cf8c-191c-97f2-b2709a843dfc - Pink - 072343d0-1ce9-0952-4106-5312af4a789a - Purple - 0ae2f973-98c1-a4e8-9f4b-9db2044ab079 - Red - 1da8eb54-a70f-bd4a-77e5-c7b815c3b2a2 - Violet - 602243f4-8fb1-ac00-d5bc-7ab50c4433b7 - White - 1e0948ab-706a-b309-434c-a694436a79be - Yellow - 8078ffb3-840c-d037-caf3-5cd02c2e7040 - 072343d0-1ce9-0952-4106-5312af4a789a color - 2 - 1 - 1.6000000000000001 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple @@ -141,9 +116,9 @@ color - 1.2 - 0.40000000000000002 - 1.6000000000000001 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple @@ -155,9 +130,9 @@ color - 2 - 0 - 0 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple @@ -169,9 +144,9 @@ color - 2 - 2 - 2 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple @@ -183,9 +158,9 @@ color - 0.34999999999999998 - 0.34999999999999998 - 2 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple @@ -197,9 +172,9 @@ color - 0.5 - 0 - 2 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple @@ -211,9 +186,9 @@ color - 2 - 2 - 0 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple @@ -239,9 +214,9 @@ color - 0 - 2 - 0 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple @@ -253,9 +228,9 @@ color - 2 - 0 - 2 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple @@ -267,9 +242,9 @@ color - 2 - 0.5 - 0 + 0.97999999999999998 + 0.68999999999999995 + 0.34000000000000002 1 multiple diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dc3243222..50f0d1079 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -748,7 +748,71 @@ 1 - AscentSpoofClientIndex + AscentFriendColor + + Comment + Color of chat messages from other residents + Persist + 1 + Type + Color4 + Value + + 1.0 + 1.0 + 0.0 + 1.0 + + + AscentLindenColor + + Comment + Color of chat messages from other residents + Persist + 1 + Type + Color4 + Value + + 0.0 + 0.0 + 1.0 + 1.0 + + + AscentMutedColor + + Comment + Color of chat messages from other residents + Persist + 1 + Type + Color4 + Value + + 0.7 + 0.7 + 0.7 + 1.0 + + + AscentEstateOwnerColor + + Comment + Color of chat messages from other residents + Persist + 1 + Type + Color4 + Value + + 1.0 + 0.6 + 1.0 + 1.0 + + + AscentReportClientIndex Comment Show your own tag @@ -759,7 +823,7 @@ Value 1 - AscentSpoofClientUUID + AscentReportClientUUID Comment Broadcasted Client Key diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index 03e2bcc03..61f8eda9a 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -14,6 +14,70 @@ + AscentFriendColor + + Comment + Color of chat messages from other residents + Persist + 1 + Type + Color4 + Value + + 1.0 + 1.0 + 0.0 + 1.0 + + + AscentLindenColor + + Comment + Color of chat messages from other residents + Persist + 1 + Type + Color4 + Value + + 0.0 + 0.0 + 1.0 + 1.0 + + + AscentMutedColor + + Comment + Color of chat messages from other residents + Persist + 1 + Type + Color4 + Value + + 0.7 + 0.7 + 0.7 + 1.0 + + + AscentEstateOwnerColor + + Comment + Color of chat messages from other residents + Persist + 1 + Type + Color4 + Value + + 1.0 + 0.6 + 1.0 + 1.0 + + AscentUseCustomTag Comment @@ -52,7 +116,7 @@ Value Custom - AscentSpoofClientIndex + AscentReportClientIndex Comment Show your own tag @@ -63,7 +127,7 @@ Value 1 - AscentSpoofClientUUID + AscentReportClientUUID Comment Broadcasted Client Key diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp index 178af02e5..e50a2c4a7 100644 --- a/indra/newview/ascentprefsvan.cpp +++ b/indra/newview/ascentprefsvan.cpp @@ -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; diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h index ef49c2b07..0cd18d98f 100644 --- a/indra/newview/ascentprefsvan.h +++ b/indra/newview/ascentprefsvan.h @@ -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 diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 0054f37b2..f4a55bd98 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -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 { diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index a6b29b5ec..bc7296253 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -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"; } // 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(); } - // + char temp[32]; LLColor4 color = LLColor4::black; diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index a0b60f57f..c0129aaeb 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -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( diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 95a1c9d7d..e7e33fe7f 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -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 diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index fcf3418ed..89bfad99c 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -95,7 +95,6 @@ public: // void getClientInfo(std::string& clientTag, LLColor4& tagColor, BOOL useComment=FALSE); - LLColor4 getTagColorByUUID(std::string uuid_str); std::string extraMetadata; // diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml index 372ac12e7..ceefbf8b7 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml @@ -371,32 +371,35 @@ width="400" /> - Pivot Point - - - - - - + follows="left|top|right|bottom" label="Building" name="Building"> + + Pivot Point + + + + + + + diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml index 3a52f45f2..06ef150e2 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml @@ -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"> - + Ascent - + Explicit - - Emerald (Standard) + + Blue - - Emerald (Blue) + + Fuschia - - Emerald (Fuschia) + + Green - - Emerald (Orange) + + Orange - - Emerald (Pink) + + Pink - - Emerald (Purple) + + Purple - - Emerald (Red) + + Red - - Emerald (Violet) + + Violet - - Emerald (White) + + White - - Emerald (Yellow) + + Yellow - + Hide Tag diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml index 4cac70dce..618110725 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml @@ -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" /> -