diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-13 11:23:37 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-13 11:23:37 -0700 |
| commit | 6b597ad40dcec2f494988eddf76376ae439c1059 (patch) | |
| tree | db15452f572d5c0ca39ba7e9f82e23c86573b8b7 /indra/newview/lllogchat.h | |
| parent | 2084d33c1ec827b4e8d975a3bf1232e971f704e2 (diff) | |
| parent | a6370cf4a72371e090d45f2a147929d016f42780 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/lllogchat.h')
| -rw-r--r-- | indra/newview/lllogchat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index 95f83e64e5..d3e9adcc37 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -55,7 +55,7 @@ public: void (*callback)(ELogLineType, const LLSD&, void*), void* userdata); - static void loadChatHistory(const std::string& file_name, std::list<LLSD>& messages, bool load_all_history = false); + static void loadChatHistory(const std::string& file_name, std::list<LLSD>& messages, const LLSD& load_params = LLSD()); private: static std::string cleanFileName(std::string filename); }; @@ -105,7 +105,7 @@ public: * * @return false if failed to parse mandatory data - message text */ - static bool parse(std::string& raw, LLSD& im); + static bool parse(std::string& raw, LLSD& im, const LLSD& parse_params = LLSD()); protected: LLChatLogParser(); |