diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
| commit | be69197e0d3af1832a22c6d2475e3e1178a88a31 (patch) | |
| tree | de9abd1dfc12d6da7e11e385c7dbbb53e631353a /indra/newview/lllogchat.cpp | |
| parent | 04c7a7a64ac40f471dcec0019a2c7235ad22bd3d (diff) | |
| parent | e9f5ed6591fb5d2513b5065622b9e7dac6737913 (diff) | |
merge changes from project trunk
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 485d4677b1..0218a45b8e 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -927,7 +927,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] = stuff.substr(0, divider_pos); |