aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterchat.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:16 -0500
committerJacek Antonelli2008-08-15 23:45:16 -0500
commit3f27ba891ac4d032753b219b4b96d1ffbc9fb488 (patch)
tree504932ee91a0356fba7ea48798887c96867e492f /linden/indra/newview/llfloaterchat.cpp
parentSecond Life viewer sources 1.18.4.3 (diff)
downloadmeta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.zip
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.gz
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.bz2
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.xz
Second Life viewer sources 1.18.5.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterchat.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 686cc81..b435ada 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -73,6 +73,9 @@
73#include "llfloaterhtml.h" 73#include "llfloaterhtml.h"
74#include "llweb.h" 74#include "llweb.h"
75 75
76// Used for LCD display
77extern void AddNewIMToLCD(const LLString &newLine);
78extern void AddNewChatToLCD(const LLString &newLine);
76// 79//
77// Constants 80// Constants
78// 81//
@@ -309,6 +312,20 @@ void LLFloaterChat::addChat(const LLChat& chat,
309 chat.mChatType == CHAT_TYPE_DEBUG_MSG 312 chat.mChatType == CHAT_TYPE_DEBUG_MSG
310 && !gSavedSettings.getBOOL("ScriptErrorsAsChat"); 313 && !gSavedSettings.getBOOL("ScriptErrorsAsChat");
311 314
315#if LL_WINDOWS && LL_LCD_COMPILE
316 // add into LCD displays
317 if (!invisible_script_debug_chat)
318 {
319 if (!from_instant_message)
320 {
321 AddNewChatToLCD(chat.mText);
322 }
323 else
324 {
325 AddNewIMToLCD(chat.mText);
326 }
327 }
328#endif
312 if (!invisible_script_debug_chat 329 if (!invisible_script_debug_chat
313 && !chat.mMuted 330 && !chat.mMuted
314 && gConsole 331 && gConsole