Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer
Conflicts: indra/newview/skins/default/xui/en-us/strings.xml
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user