Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer

Conflicts:
	indra/newview/skins/default/xui/en-us/strings.xml
This commit is contained in:
Siana Gearz
2012-08-09 03:04:13 +02:00
41 changed files with 3358 additions and 2289 deletions

View File

@@ -455,20 +455,6 @@ void LLFloaterChat::addChat(const LLChat& chat,
}
// [/RLVa:KB]
#if LL_LCD_COMPILE
// 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