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

Disable rlva name substitution in LLHUDNameTag::setString. Was redundant and hosed up client tags.

Browse Source
This commit is contained in:
Shyotl
2011-12-11 00:47:44 -06:00
parent a726de0e99
commit 62febda165
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llhudnametag.cpp
View File

@@ -563,7 +563,9 @@ void LLHUDNameTag::setString(const std::string &text_utf8)
//[RLVa:KB] - Checked: 2010-03-02 (RLVa-1.2.0a) | Modified: RLVa-1.0.0f //[RLVa:KB] - Checked: 2010-03-02 (RLVa-1.2.0a) | Modified: RLVa-1.0.0f
// NOTE: setString() is only called for debug beacons and the floating name tags (which we don't want to censor // NOTE: setString() is only called for debug beacons and the floating name tags (which we don't want to censor
// because you'd see "(Region hidden) LastName" if you happen to go to a sim who's name is your first name :p // because you'd see "(Region hidden) LastName" if you happen to go to a sim who's name is your first name :p
std::string text(text_utf8);
//Disabled because logic in LLVOAvatar::idleUpdateNameTag should be handling this.
/*std::string text(text_utf8);
if (rlv_handler_t::isEnabled()) if (rlv_handler_t::isEnabled())
{ {
if (gRlvHandler.canShowHoverText(mSourceObject)) if (gRlvHandler.canShowHoverText(mSourceObject))
@@ -575,11 +577,11 @@ void LLHUDNameTag::setString(const std::string &text_utf8)
{ {
text = ""; text = "";
} }
} }*/
//[/RLVa:KB] //[/RLVa:KB]
mTextSegments.clear(); mTextSegments.clear();
addLine(text, mColor); addLine(text_utf8, mColor);
} }
void LLHUDNameTag::clearString() void LLHUDNameTag::clearString()