diff options
author | Sergey Borushevsky <sborushevsky@productengine.com> | 2009-10-29 20:29:55 +0200 |
---|---|---|
committer | Sergey Borushevsky <sborushevsky@productengine.com> | 2009-10-29 20:29:55 +0200 |
commit | 15687e2acd07ed3c0a56a61af982595b99dc064f (patch) | |
tree | 2e66793429eb7cc465ae2af88cabe391f2443042 /indra/newview/lllogchat.h | |
parent | 7d8c41b15076666f47470b28b1e7e7b63c064415 (diff) | |
parent | e724fa0ab4c4675b94546f67bd4323704201f4a6 (diff) |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lllogchat.h')
-rw-r--r-- | indra/newview/lllogchat.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index ad903b66fe..e252cd7d41 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -41,13 +41,18 @@ public: enum ELogLineType { LOG_EMPTY, LOG_LINE, + LOG_LLSD, LOG_END }; static std::string timestamp(bool withdate = false); static std::string makeLogFileName(std::string(filename)); - static void saveHistory(std::string filename, std::string line); - static void loadHistory(std::string filename, - void (*callback)(ELogLineType,std::string,void*), + static void saveHistory(const std::string& filename, + const std::string& from, + const LLUUID& from_id, + const std::string& line); + + static void loadHistory(const std::string& filename, + void (*callback)(ELogLineType, const LLSD&, void*), void* userdata); private: static std::string cleanFileName(std::string filename); |