diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-06 18:18:44 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-06 18:18:44 -0800 |
| commit | 560aba3aa4d5eb2c65132db4da355adae82a47f0 (patch) | |
| tree | e8739806c7f7beb8efc20e59442d60c0e5c88bd9 /indra/newview/lllogchat.h | |
| parent | 7ed270ff9dfdbc905dbee70907d3057a5ae490e7 (diff) | |
| parent | ec0ac12eba9d944ade7bd734226a03ea2eb47229 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/lllogchat.h')
| -rw-r--r-- | indra/newview/lllogchat.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index b35a94b4b3..5fbb4ade96 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -51,16 +51,13 @@ public: const std::string& line); static void getListOfTranscriptFiles(std::vector<std::string>& list); - /** @deprecated @see loadChatHistory() */ - static void loadHistory(const std::string& filename, - void (*callback)(ELogLineType, const LLSD&, void*), - void* userdata); - static void loadChatHistory(const std::string& file_name, std::list<LLSD>& messages, const LLSD& load_params = LLSD()); typedef boost::signals2::signal<void ()> save_history_signal_t; static boost::signals2::connection setSaveHistorySignal(const save_history_signal_t::slot_type& cb); + static void deleteTranscripts(); + private: static std::string cleanFileName(std::string filename); static save_history_signal_t * sSaveHistorySignal; @@ -123,6 +120,6 @@ extern const std::string LL_IM_TIME; //("time"); extern const std::string LL_IM_TEXT; //("message"); extern const std::string LL_IM_FROM; //("from"); extern const std::string LL_IM_FROM_ID; //("from_id"); -extern const std::string LL_TRANSCRIPT_FILE_EXTENSION; //("ll.txt"); +extern const std::string LL_TRANSCRIPT_FILE_EXTENSION; //("txt"); #endif |