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

Simplify tag decoding,

Browse Source 
Disable showing other's tags by default as it appears broken in most viewers
This commit is contained in:
Latif Khalifa
2013-11-05 07:25:11 +01:00
parent 7ffb751ead
commit d8db37f3fb
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings_ascent.xml
View File

@@ -277,7 +277,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>0</integer>
</map> </map>
<key>AscentShowOthersTagColor</key> <key>AscentShowOthersTagColor</key>
<map> <map>

10
indra/newview/llvoavatar.cpp
View File

@@ -723,15 +723,11 @@ const LLSD SHClientTagMgr::generateClientTag(const LLVOAvatar* pAvatar) const
if(pAvatar->isFullyLoaded() && pTextureEntry->getGlow() > 0.0) if(pAvatar->isFullyLoaded() && pTextureEntry->getGlow() > 0.0)
{ {
///llinfos << "Using new client identifier." << llendl; ///llinfos << "Using new client identifier." << llendl;
U8 tag_buffer[UUID_BYTES+1]; U32 tag_len = strnlen((const char*)&id.mData[0], UUID_BYTES);
memset(&tag_buffer, 0, UUID_BYTES); std::string client((const char*)&id.mData[0], tag_len);
memcpy(&tag_buffer[0], &id.mData, UUID_BYTES);
tag_buffer[UUID_BYTES] = 0;
U32 tag_len = llmin((S32)strlen((const char*)&tag_buffer[0]), UUID_BYTES);
std::string client((char*)&tag_buffer[0], tag_len);
LLStringFn::replace_ascii_controlchars(client, LL_UNKNOWN_CHAR); LLStringFn::replace_ascii_controlchars(client, LL_UNKNOWN_CHAR);
LLSD info; LLSD info;
info.insert("name", std::string((char*)&tag_buffer[0], tag_len)); info.insert("name", client);
info.insert("color", pTextureEntry->getColor().getValue()); info.insert("color", pTextureEntry->getColor().getValue());
return info; return info;
} }