diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-06 21:31:34 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-06 21:31:34 +0200 |
| commit | fa39ff67f081e2e957d2ba7fd9f014747ff10963 (patch) | |
| tree | dc67779842f2a670e5c242c07e24d27ec701f8d5 /indra/newview/lllogchat.h | |
| parent | 2076f4af0fc946c3bd79754a1deefc495ee7edb9 (diff) | |
| parent | 9a3f1f6a3c4506ae08c7af7f92f11da40d80ef00 (diff) | |
Merge branch 'master' into DRTVWR-497
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 b71a34ae0a..8b7fe14e16 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -106,7 +106,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; boost::signals2::connection setSaveHistorySignal(const save_history_signal_t::slot_type& cb); @@ -196,6 +196,7 @@ protected: virtual ~LLChatLogParser() {}; }; +extern const std::string GROUP_CHAT_SUFFIX; // LLSD map lookup constants extern const std::string LL_IM_TIME; //("time"); |