summaryrefslogtreecommitdiff
path: root/indra/newview/llscreenchannel.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-29 10:42:02 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-29 10:42:02 -0700
commit95031093c795f3a97cdc673c7b7807c944742ab8 (patch)
tree378e103331e289894bbc915b15772ac844b6ccae /indra/newview/llscreenchannel.cpp
parentfb4e95f7ea0a1f6e900f6ee1de73ec02860ff815 (diff)
parent15687e2acd07ed3c0a56a61af982595b99dc064f (diff)
merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 3824-3835
Diffstat (limited to 'indra/newview/llscreenchannel.cpp')
-rw-r--r--indra/newview/llscreenchannel.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 73dcd1dd92..e4dbcbd219 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -44,7 +44,6 @@
#include "lltrans.h"
#include "lldockablefloater.h"
-#include "llimpanel.h"
#include "llsyswellwindow.h"
#include "llimfloater.h"