diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
| commit | db0ffdf270f9f9b656333e317a0cf6fadc14a711 (patch) | |
| tree | 6008b6b3c36dd9cd6bd7e51d63aea7210396e7bf /indra/newview/llnearbychatbar.cpp | |
| parent | 959ec0c305914ac71caa12920ca81230d5d9a6c4 (diff) | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
| -rw-r--r-- | indra/newview/llnearbychatbar.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 424b8c9a66..1507b7d324 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -807,8 +807,11 @@ public: { if (tokens.size() < 2) return false; S32 channel = tokens[0].asInteger(); - std::string mesg = tokens[1].asString(); - send_chat_from_viewer(mesg, CHAT_TYPE_NORMAL, channel); + + // Send unescaped message, see EXT-6353. + std::string unescaped_mesg (LLURI::unescape(tokens[1].asString())); + + send_chat_from_viewer(unescaped_mesg, CHAT_TYPE_NORMAL, channel); return true; } }; |