diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-15 15:42:21 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-15 15:42:21 -0400 |
commit | a625dbe35ebaf63ad093aedce49a042ee790fe3c (patch) | |
tree | f78e643bae9590262bce94681376254436140e2c /indra/newview/lllogchat.h | |
parent | 75722baf295aff7927bff3c70cdf0ec27399cb37 (diff) | |
parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) |
merge changes for 3.5.0-beta3
Diffstat (limited to 'indra/newview/lllogchat.h')
-rw-r--r-- | indra/newview/lllogchat.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index 784786a565..e819f00dd9 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -49,7 +49,9 @@ public: const std::string& from, const LLUUID& from_id, const std::string& line); + static void findTranscriptFiles(std::string pattern, std::vector<std::string>& list_of_transcriptions); 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()); |