diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-09 17:27:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-09 17:27:41 +0300 |
| commit | 37e4c6911902b9dcec0192e8bb93bbaeacb1d60a (patch) | |
| tree | d5d146e1cb047940cd8fa9f6d597d6ffb6859407 /indra/llui | |
| parent | 22d3ea34f29bc11f3e5bfe491f4bc0895e1d4653 (diff) | |
| parent | 8703d5b0f91d303a33624edb26ebed16c1c6d941 (diff) | |
Merge pull request #1670 from Ansariel/DRTVWR-600-maint-A
Fix issues resulting from b42f9d836b4c0f7fbd4bdae1734021e2a09fdbe8
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llresmgr.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/lltextparser.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp index 21bdf3f8a6..111c732548 100644 --- a/indra/llui/llresmgr.cpp +++ b/indra/llui/llresmgr.cpp @@ -140,7 +140,7 @@ std::string LLResMgr::getMonetaryString( S32 input ) const S32 output_pos = 0; cur_group = 0; - auto pos = digits.size()-1; + S32 pos = static_cast<S32>(digits.size()) - 1; S32 count_within_group = 0; while( (pos >= 0) && (groupings[cur_group] >= 0) ) { diff --git a/indra/llui/lltextparser.cpp b/indra/llui/lltextparser.cpp index 6a867fc759..097b168106 100644 --- a/indra/llui/lltextparser.cpp +++ b/indra/llui/lltextparser.cpp @@ -74,7 +74,7 @@ S32 LLTextParser::findPattern(const std::string &text, LLSD highlight) break; case ENDS_WITH: auto pos = ltext.rfind(pattern); - if (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); |