diff options
author | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
commit | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch) | |
tree | 051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/newview/lllogchat.h | |
parent | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff) |
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/newview/lllogchat.h')
-rw-r--r-- | indra/newview/lllogchat.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index d5fd7797e0..0fcee48dfc 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -36,10 +36,18 @@ class LLLogChat { public: + // status values for callback function + enum ELogLineType { + LOG_EMPTY, + LOG_LINE, + LOG_END + }; static LLString timestamp(bool withdate = false); static LLString makeLogFileName(LLString(filename)); static void saveHistory(LLString filename, LLString line); - static void loadHistory(LLString filename, void (*callback)(LLString,void*),void* userdata); + static void loadHistory(LLString filename, + void (*callback)(ELogLineType,LLString,void*), + void* userdata); }; #endif |