diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-08-21 16:22:43 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-08-21 16:22:43 +0300 |
| commit | 9773e06cc12b432772eda856c5281c749caec988 (patch) | |
| tree | 9d600cf2d5af2993a6272df1c5f048e41a0c5451 /indra/newview/lllogchat.h | |
| parent | 99a4bd23dadbdaf8e82ceca26af531c93d5fd4a6 (diff) | |
SL-11753 FIXED Group & Resident with the same name share chat history.
Diffstat (limited to 'indra/newview/lllogchat.h')
| -rw-r--r-- | indra/newview/lllogchat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index fcbd38a044..6ccb2caf43 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -104,7 +104,7 @@ public: static void getListOfTranscriptFiles(std::vector<std::string>& list); static void getListOfTranscriptBackupFiles(std::vector<std::string>& list_of_transcriptions); - static void loadChatHistory(const std::string& file_name, std::list<LLSD>& messages, const LLSD& load_params = LLSD()); + static void loadChatHistory(const std::string& file_name, std::list<LLSD>& messages, const LLSD& load_params = LLSD(), bool is_group = false); typedef boost::signals2::signal<void ()> save_history_signal_t; static boost::signals2::connection setSaveHistorySignal(const save_history_signal_t::slot_type& cb); @@ -192,6 +192,7 @@ protected: virtual ~LLChatLogParser() {}; }; +extern const std::string GROUP_CHAT_SUFFIX; // LLSD map lookup constants extern const std::string LL_IM_TIME; //("time"); |