diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-08-16 17:53:02 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-08-16 17:53:02 +0300 |
| commit | 1bfa064a4880bfed90adbeee180b117024511942 (patch) | |
| tree | f98292fdf30a2c22caf47cc192f3e73dc3e8c10e /indra/newview | |
| parent | f7ad4bdd19b2937a6ffe40437276410901924d92 (diff) | |
SL-11740 FIXED Wrong entries in conversation.log for groups with | in the name
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llconversationlog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 9ccf9b98f7..ba6b251d58 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -486,7 +486,7 @@ bool LLConversationLog::saveToFile(const std::string& filename) (S32)conv_it->getConversationType(), (S32)0, (S32)conv_it->hasOfflineMessages(), - conv_it->getConversationName().c_str(), + LLURI::escape(conv_it->getConversationName()).c_str(), participant_id.c_str(), conversation_id.c_str(), LLURI::escape(conv_it->getHistoryFileName()).c_str()); @@ -541,7 +541,7 @@ bool LLConversationLog::loadFromFile(const std::string& filename) params.time(LLUnits::Seconds::fromValue(time)) .conversation_type((SessionType)stype) .has_offline_ims(has_offline_ims) - .conversation_name(conv_name_buffer) + .conversation_name(LLURI::unescape(conv_name_buffer)) .participant_id(LLUUID(part_id_buffer)) .session_id(LLUUID(conv_id_buffer)) .history_filename(LLURI::unescape(history_file_name)); |