summaryrefslogtreecommitdiff
path: root/indra/newview/lllogchat.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-02-25 01:34:52 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-02-25 01:34:52 -0800
commitc6163fafaac9c72683b11894ed309d1f55a745c8 (patch)
tree612be60185cbea598bdf907f045c9fc29fb40a2c /indra/newview/lllogchat.cpp
parent0bf246ed663ad11d316fe7898a3fee3f57676d4b (diff)
parent82de841c52357642d30b6d89b11da079f9c0f5d1 (diff)
automated merge
Diffstat (limited to 'indra/newview/lllogchat.cpp')
-rw-r--r--indra/newview/lllogchat.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 92f19c9232..4e5aaeb66a 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -35,7 +35,6 @@
#include "llagent.h"
#include "llagentui.h"
#include "lllogchat.h"
-#include "llfloaterchat.h"
#include "lltrans.h"
#include "llviewercontrol.h"