From 7b0c364a6bfc3dc47197d1bb0af025b303ef5079 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 3 Apr 2013 15:07:26 +0300 Subject: CHUI-838 FIXED (Opening chat history for groups only works once per session, if at all) --- indra/newview/lllogchat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lllogchat.h') diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index e819f00dd9..77bb2a1570 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -67,7 +67,7 @@ public: std::vector& listOfFilesToMove); static void deleteTranscripts(); - static bool isTranscriptExist(const LLUUID& avatar_id); + static bool isTranscriptExist(const LLUUID& avatar_id, bool is_group=false); private: static std::string cleanFileName(std::string filename); -- cgit v1.2.3 From 25c222e31770cb2c10e262b02ae9065521986349 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 23 Apr 2013 15:09:41 +0300 Subject: CHUI-943 FIXED "Chat history" menu item is added to context menu for Nearby chat. --- indra/newview/lllogchat.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/lllogchat.h') diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index 77bb2a1570..bd70dbaac9 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -68,6 +68,7 @@ public: static void deleteTranscripts(); static bool isTranscriptExist(const LLUUID& avatar_id, bool is_group=false); + static bool isNearbyTranscriptExist(); private: static std::string cleanFileName(std::string filename); -- cgit v1.2.3 From 13361137d0d2ccb750d6002826763579d3d1cc69 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 9 Jul 2013 15:13:38 +0300 Subject: CHUI-978 FIXED Load data from chat log file in separate thread to prevent viewer freeze --- indra/newview/lllogchat.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'indra/newview/lllogchat.h') diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index bd70dbaac9..acee99afa2 100755 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -28,6 +28,24 @@ #define LL_LLLOGCHAT_H class LLChat; +class LLLoadHistoryThread : public LLThread +{ +private: + std::string mFileName; + std::list mMessages; + LLSD mLoadParams; + bool mNewLoad; +public: + LLLoadHistoryThread(); + + void setHistoryParams(const std::string& file_name, const LLSD& load_params); + virtual void loadHistory(const std::string& file_name, std::list& messages, const LLSD& load_params); + virtual void run(); + + typedef boost::signals2::signal& messages,const std::string& file_name)> load_end_signal_t; + static load_end_signal_t * mLoadEndSignal; + static boost::signals2::connection setLoadEndSignal(const load_end_signal_t::slot_type& cb); +}; class LLLogChat { @@ -39,6 +57,7 @@ public: LOG_LLSD, LOG_END }; + static std::string timestamp(bool withdate = false); static std::string makeLogFileName(std::string(filename)); /** @@ -54,6 +73,7 @@ public: static void getListOfTranscriptBackupFiles(std::vector& list_of_transcriptions); static void loadChatHistory(const std::string& file_name, std::list& messages, const LLSD& load_params = LLSD()); + static void startChatHistoryThread(const std::string& file_name, const LLSD& load_params); typedef boost::signals2::signal save_history_signal_t; static boost::signals2::connection setSaveHistorySignal(const save_history_signal_t::slot_type& cb); @@ -127,6 +147,7 @@ protected: virtual ~LLChatLogParser() {}; }; + // LLSD map lookup constants extern const std::string LL_IM_TIME; //("time"); extern const std::string LL_IM_TEXT; //("message"); -- cgit v1.2.3