diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-01-17 16:06:27 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-01-17 16:06:27 +0000 |
| commit | e36745eb986ec9dd04c7f4f6d7a7249b7d5286a2 (patch) | |
| tree | e2107a6f3afd57fcc817a5b8ea3566295105d0d4 /indra/newview/lllogchat.cpp | |
| parent | 500aaa16ff2aa35b318176fd01cfaba47376f5a5 (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
merge
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)); |