livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/llappearance/llpolymorph.cpp
#	indra/llui/lltextparser.cpp
master
Ansariel 2024-06-09 17:02:21 +02:00
parent 5d231c4486 37e4c69119
commit 7ab12bd376
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llappearance/llpolymorph.cpp
View File

@ -387,7 +387,7 @@ bool LLPolyMorphTarget::setInfo(LLPolyMorphTargetInfo* info)
{
const std::string driven_tag = "_Driven";
auto pos = morph_param_name.find(driven_tag);
if (pos != std::string::npos)
if (pos != std::string::npos && pos > 0)
{
morph_param_name = morph_param_name.substr(0,pos);
mMorphData = mMesh->getMorphData(morph_param_name);

2
indra/llui/lltextparser.cpp
View File

@ -74,7 +74,7 @@ S32 LLTextParser::findPattern(const std::string &text, LLSD highlight)
break;
case ENDS_WITH:
auto pos = ltext.rfind(pattern);
if (pos != std::string::npos && pos >= 0 && (ltext.length()-pattern.length()==pos)) found = pos;
if (pos != std::string::npos && pos >= 0 && (ltext.length() - pattern.length() == pos)) found = pos;
break;
}
return static_cast<S32>(found);