diff options
| author | Jake Simpson <jake@lindenlab.com> | 2007-04-18 21:08:54 +0000 |
|---|---|---|
| committer | Jake Simpson <jake@lindenlab.com> | 2007-04-18 21:08:54 +0000 |
| commit | 2f438a409e7777020269c73df1b6cae83669e664 (patch) | |
| tree | ada6125f611c74283843dedeab981ed538bd8e29 /indra/newview/llfloaterchat.cpp | |
| parent | c94062fb5b4d0ddbbd8b623e209d725b50a59851 (diff) | |
svn merge -r 59608:60615 svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release
Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
| -rw-r--r-- | indra/newview/llfloaterchat.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp index 93eb24f36d..bddae82b7f 100644 --- a/indra/newview/llfloaterchat.cpp +++ b/indra/newview/llfloaterchat.cpp @@ -47,6 +47,9 @@ #include "llfloaterhtml.h" #include "llweb.h" +// Used for LCD display +extern void AddNewIMToLCD(const LLString &newLine); +extern void AddNewChatToLCD(const LLString &newLine); // // Constants // @@ -330,6 +333,20 @@ void LLFloaterChat::addChat(const LLChat& chat, chat.mChatType == CHAT_TYPE_DEBUG_MSG && !gSavedSettings.getBOOL("ScriptErrorsAsChat"); +#if LL_WINDOWS + // add into LCD displays + if (!invisible_script_debug_chat) + { + if (!from_instant_message) + { + AddNewChatToLCD(chat.mText); + } + else + { + AddNewIMToLCD(chat.mText); + } + } +#endif if (!invisible_script_debug_chat && !chat.mMuted && gConsole |