From 2f438a409e7777020269c73df1b6cae83669e664 Mon Sep 17 00:00:00 2001
From: Jake Simpson <jake@lindenlab.com>
Date: Wed, 18 Apr 2007 21:08:54 +0000
Subject: 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.
---
 indra/newview/llfloaterchat.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'indra/newview/llfloaterchat.cpp')

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 
-- 
cgit v1.3