diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 50f0d1079..1bb9649b3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -608,7 +608,22 @@ 0 - + NaclTagColor + + Comment + The tag color you wish to have. + Persist + 1 + Type + Color4 + Value + + 0.7 + 1.0 + 1.0 + 1.0 + + AscentPowerfulWizard @@ -624,7 +639,7 @@ AscentUseCustomTag Comment - Show a custom local tag. + Show a custom tag. Persist 1 Type @@ -635,7 +650,7 @@ AscentCustomTagColor Comment - Color of custom local tag. + Color of custom tag. Persist 1 Type diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index f4a55bd98..36df2e0c2 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -93,6 +93,7 @@ #include "llmorphview.h" #include "llmoveview.h" #include "llnotify.h" +#include "llprimitive.h" //For new client id method -HgB #include "llquantize.h" #include "llsdutil.h" #include "llselectmgr.h" @@ -7498,6 +7499,22 @@ void LLAgent::sendAgentSetAppearance() gSavedSettings.setString("AscentReportClientUUID", "8873757c-092a-98fb-1afd-ecd347566fcd"); } + /*if(gSavedSettings.getString("AscentReportClientUUID") != "c228d1cf-4b5d-4ba8-84f4-899a0796aa97") + { + U8 client_buffer[UUID_BYTES]; + memset(&client_buffer, 0, UUID_BYTES); + LLTextureEntry* entry = LLPrimitive::getTE(0);// getTE(0);// LLAgent::getAvatarObject()->mDrawable->getFace(0)->getT + //You edit this to change the tag in your client. Yes. + const char* tag_client = "Ascent"; + strncpy((char*)&client_buffer[0], tag_client, UUID_BYTES); + LLUUID part_a; + memcpy(&part_a.mData, &client_buffer[0], UUID_BYTES); + entry->setColor(gSavedSettings.getColor4("AscentCustomTagColor") ); + //This glow is used to tell if the tag color and name is set or not. + entry->setGlow(0.1); + entry->setID(part_a); + }*/ + mAvatarObject->packTEMessage( gMessageSystem, 1, gSavedSettings.getString("AscentReportClientUUID") ); } else diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index e7e33fe7f..362912b66 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3378,8 +3378,16 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom } else if (gSavedSettings.getBOOL("AscentUseCustomTag")) { - color = gSavedSettings.getColor4("AscentCustomTagColor"); - client = gSavedSettings.getString("AscentCustomTagLabel"); + if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) + { + color = gSavedSettings.getColor4("AscentCustomTagColor"); + client = gSavedSettings.getString("AscentCustomTagLabel"); + } + else + { + color = gSavedPerAccountSettings.getColor4("AscentCustomTagColor"); + client = gSavedPerAccountSettings.getString("AscentCustomTagLabel"); + } return; } else if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) @@ -3446,14 +3454,7 @@ 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)) + if (LLVOAvatar::sClientResolutionList.has("isComplete") && LLVOAvatar::sClientResolutionList.has(uuid_str)) { LLSD cllsd = LLVOAvatar::sClientResolutionList[uuid_str]; @@ -3604,10 +3605,25 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) } LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" ); - // - if(isFullyLoaded()) + + //Zwagoth's new client identification - HgB + const LLTextureEntry* texentry = getTE(0); + if(texentry->getGlow() > 0.0) { - getClientInfo(client,avatar_name_color); + LLColor4 tag_color = texentry->getColor(); + tag_color.setAlpha(alpha); + mNameText->setColor(tag_color); + } + else + { + LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" ); + avatar_name_color.setAlpha(alpha); + mNameText->setColor(avatar_name_color); + //The old client identification. + if(isFullyLoaded()) + { + getClientInfo(client,avatar_name_color); + } } avatar_name_color.setAlpha(alpha); @@ -8962,6 +8978,20 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) unpackTEMessage(mesgsys, _PREHASH_ObjectData); // dumpAvatarTEs( "POST processAvatarAppearance()" ); + const LLTextureEntry* tex = getTE(0); + if(tex->getGlow() > 0.0) + { + U8 tag_buffer[UUID_BYTES+1]; + memset(&tag_buffer, 0, UUID_BYTES); + memcpy(&tag_buffer[0], &tex->getID().mData, UUID_BYTES); + tag_buffer[UUID_BYTES] = 0; + U32 tag_len = strlen((const char*)&tag_buffer[0]); + tag_len = (tag_len>UUID_BYTES) ? (UUID_BYTES) : tag_len; + mClientTag = std::string((char*)&tag_buffer[0], tag_len); + LLStringFn::replace_ascii_controlchars(mClientTag, LL_UNKNOWN_CHAR); + mNameString.clear(); + } + // prevent the overwriting of valid baked textures with invalid baked textures for (U8 baked_index = 0; baked_index < mBakedTextureData.size(); baked_index++) { diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 89bfad99c..e9cb3adb8 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -710,6 +710,7 @@ private: F32 mAdjustedPixelArea; LLWString mNameString; + std::string mClientTag; //Zwagoth's new client identification system. -HgB std::string mTitle; BOOL mNameAway; BOOL mNameBusy; diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml index 5cf002913..7d8840dc1 100644 --- a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml +++ b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml @@ -92,8 +92,6 @@ image_unselected="icn_speaker_dark.tga" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25" /> - Explicit - - Blue - - - Fuschia - - - Green - - - Orange - - - Pink - - - Purple - - - Red - - - Violet - - - White - - - Yellow - - Hide Tag + No Tag