summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
-rw-r--r--indra/newview/llfloaterchat.cpp23
1 files changed, 18 insertions, 5 deletions
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 851d81f349..3f510fc500 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -434,12 +434,25 @@ void LLFloaterChat::loadHistory()
}
//static
-void LLFloaterChat::chatFromLogFile(LLString line, void* userdata)
+void LLFloaterChat::chatFromLogFile(LLLogChat::ELogLineType type , LLString line, void* userdata)
{
- LLChat chat;
-
- chat.mText = line;
- addChatHistory(chat, FALSE);
+ switch (type)
+ {
+ case LLLogChat::LOG_EMPTY:
+ case LLLogChat::LOG_END:
+ // *TODO: nice message from XML file here
+ break;
+ case LLLogChat::LOG_LINE:
+ {
+ LLChat chat;
+ chat.mText = line;
+ addChatHistory(chat, FALSE);
+ }
+ break;
+ default:
+ // nothing
+ break;
+ }
}
//static