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

Removed the OTR button - Probably not going to bother with OTR.

Browse Source 
Added some code for a later feature in llagent and llvoavatar.
Performed a minor tweak to the client tag code that was incorrect.
Removed Emerald's color options in the tag dropdown in accordance of them theoretically being removed tomorrow.
This commit is contained in:
Beeks
2010-09-03 03:13:42 -04:00
parent ef4d705f64
commit 4650ca453c
6 changed files with 80 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -608,7 +608,22 @@
<integer>0</integer>
</map>
<!-- Expanded Settings that have optionally Account-Specific alternatives -->
<key>NaclTagColor</key>
<map>
<key>Comment</key>
<string>The tag color you wish to have.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.7</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</map>
<!-- Ascent-Specific Settings -->
<key>AscentPowerfulWizard</key>
<map>
@@ -624,7 +639,7 @@
<key>AscentUseCustomTag</key>
<map>
<key>Comment</key>
<string>Show a custom local tag.</string>
<string>Show a custom tag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -635,7 +650,7 @@
<key>AscentCustomTagColor</key>
<map>
<key>Comment</key>
<string>Color of custom local tag.</string>
<string>Color of custom tag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

17
indra/newview/llagent.cpp
View File

@@ -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

56
indra/newview/llvoavatar.cpp
View File

@@ -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" );
// <edit>
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++)
{

1
indra/newview/llvoavatar.h
View File

@@ -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;

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

@@ -92,8 +92,6 @@
image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
name="mute_btn" tool_tip="Mute voice" width="25" />
</panel>
<combo_box bottom="-20" follows="top|left" left="180" height="20" width="120"
label="OTR: Not Private" name="otr_combo"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="30" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" height="221" left="5"

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

@@ -36,49 +36,9 @@
value="734fed29-4c51-63e5-1648-6589949d7585">
Explicit
</combo_item>
<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="Fuschia"
value="730f719f-2922-2028-cc7a-ba98894e8288">
Fuschia
</combo_item>
<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="Orange"
value="585f11b5-985a-1f3b-5457-4a282a5024a3">
Orange
</combo_item>
<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="Purple"
value="ef3e515f-8cb5-d0de-5520-05cea50eebb4">
Purple
</combo_item>
<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="Violet"
value="8ec4dbe2-8eba-9acb-9b7f-c46c2bf32815">
Violet
</combo_item>
<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="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">
Hide Tag
No Tag
</combo_item>
</combo_box>
<check_box bottom_delta="-23" control_name="AscentShowSelfTag" enabled="true"