diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-01-19 11:18:29 -0500 |
| commit | a7911c43791a76f0f93f920f527970125afdc730 (patch) | |
| tree | 99228045170856cf7721e83274bc9d74b45f42a4 /indra/newview/lllogchat.cpp | |
| parent | 444643aeb0b80fdfbe28e0e2faae56de9d4f6e4a (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
merge changes for 5.1.0-release
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 5abd99d36f..c535fc1cdf 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -951,7 +951,7 @@ bool LLChatLogParser::parse(std::string& raw, LLSD& im, const LLSD& parse_params //possibly a case of complex object names consisting of 3+ words if (!has_name) { - U32 divider_pos = stuff.find(NAME_TEXT_DIVIDER); + std::string::size_type divider_pos = stuff.find(NAME_TEXT_DIVIDER); if (divider_pos != std::string::npos && divider_pos < (stuff.length() - NAME_TEXT_DIVIDER.length())) { im[LL_IM_FROM] = LLURI::unescape(stuff.substr(0, divider_pos)); |