summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchat.cpp
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-11 13:37:00 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-12-11 13:37:00 -0500
commitf042f35381f961e5648c239ae9dbf4b40941e96e (patch)
treeb713281f53c9c0e291b996731684b41e3b3bc1c5 /indra/newview/llfloaterchat.cpp
parentea3b99614327404f15f8c0cf98ae6d61bdd4572b (diff)
parentc74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff)
Merge of viewer2 into avp branch
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfloaterchat.cpp')
-rw-r--r--indra/newview/llfloaterchat.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 57bb93d81a..b9e0f928f1 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -41,6 +41,7 @@
// project include
#include "llagent.h"
+#include "llappviewer.h"
#include "llbutton.h"
#include "llcheckboxctrl.h"
#include "llcombobox.h"
@@ -142,6 +143,10 @@ BOOL LLFloaterChat::postBuild()
void LLFloaterChat::updateConsoleVisibility()
{
+ if(gDisconnected)
+ {
+ return;
+ }
// determine whether we should show console due to not being visible
gConsole->setVisible( !isInVisibleChain() // are we not in part of UI being drawn?
|| isMinimized() // are we minimized?