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

[RLVa] Don't filter parts of words out just because they match a name under restraint

Browse Source 
This fix is free to be reused under LGPL..
This commit is contained in:
Inusaito Sayori
2014-10-19 21:44:45 -04:00
parent 341ca20529
commit 6c2871402d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/rlvcommon.cpp
View File

@@ -36,7 +36,8 @@
#include "rlvlocks.h" #include "rlvlocks.h"
#include "../lscript/lscript_byteformat.h" //Need LSCRIPTRunTimePermissionBits and SCRIPT_PERMISSION_* #include "../lscript/lscript_byteformat.h" //Need LSCRIPTRunTimePermissionBits and SCRIPT_PERMISSION_*
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string/predicate.hpp> // icontains
#include <boost/algorithm/string/regex.hpp> // regex_replace_all
// ============================================================================ // ============================================================================
// RlvNotifications // RlvNotifications
@@ -373,12 +374,12 @@ void RlvUtil::filterLocation(std::string& strUTF8Text)
LLWorld::region_list_t regions = LLWorld::getInstance()->getRegionList(); LLWorld::region_list_t regions = LLWorld::getInstance()->getRegionList();
const std::string& strHiddenRegion = RlvStrings::getString(RLV_STRING_HIDDEN_REGION); const std::string& strHiddenRegion = RlvStrings::getString(RLV_STRING_HIDDEN_REGION);
for (LLWorld::region_list_t::const_iterator itRegion = regions.begin(); itRegion != regions.end(); ++itRegion) for (LLWorld::region_list_t::const_iterator itRegion = regions.begin(); itRegion != regions.end(); ++itRegion)
boost::ireplace_all(strUTF8Text, (*itRegion)->getName(), strHiddenRegion); boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + (*itRegion)->getName() + "\\b", boost::regex::icase), strHiddenRegion);
// Filter any mention of the parcel name // Filter any mention of the parcel name
LLViewerParcelMgr* pParcelMgr = LLViewerParcelMgr::getInstance(); LLViewerParcelMgr* pParcelMgr = LLViewerParcelMgr::getInstance();
if (pParcelMgr) if (pParcelMgr)
boost::ireplace_all(strUTF8Text, pParcelMgr->getAgentParcelName(), RlvStrings::getString(RLV_STRING_HIDDEN_PARCEL)); boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + pParcelMgr->getAgentParcelName() + "\\b", boost::regex::icase), RlvStrings::getString(RLV_STRING_HIDDEN_PARCEL));
} }
// Checked: 2010-12-08 (RLVa-1.2.2c) | Modified: RLVa-1.2.2c // Checked: 2010-12-08 (RLVa-1.2.2c) | Modified: RLVa-1.2.2c
@@ -401,16 +402,16 @@ void RlvUtil::filterNames(std::string& strUTF8Text, bool fFilterLegacy)
if (boost::icontains(strLegacyName, strDisplayName)) if (boost::icontains(strLegacyName, strDisplayName))
{ {
if (fFilterLegacy) if (fFilterLegacy)
boost::ireplace_all(strUTF8Text, strLegacyName, strAnonym); boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + strLegacyName + "\\b", boost::regex::icase), strAnonym);
if (fFilterDisplay) if (fFilterDisplay)
boost::ireplace_all(strUTF8Text, strDisplayName, strAnonym); boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + strDisplayName + "\\b", boost::regex::icase), strAnonym);
} }
else else
{ {
if (fFilterDisplay) if (fFilterDisplay)
boost::ireplace_all(strUTF8Text, strDisplayName, strAnonym); boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + strDisplayName + "\\b", boost::regex::icase), strAnonym);
if (fFilterLegacy) if (fFilterLegacy)
boost::ireplace_all(strUTF8Text, strLegacyName, strAnonym); boost::replace_all_regex(strUTF8Text, boost::regex("\\b" + strLegacyName + "\\b", boost::regex::icase), strAnonym);
} }
} }
} }