diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:24:41 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:24:41 -0800 |
| commit | dd9f2ca5f555d529d8f8b6168115ca3d3155fac7 (patch) | |
| tree | 5c73fc1f5275df0c5546f2bc1dc85e0f4e83e40f /indra/newview/llchannelmanager.cpp | |
| parent | becfbd2b8295e3007fe151cd9b69d0af139040e2 (diff) | |
| parent | a27706ad2e42718ad107e25fe7c29f1c0513fabc (diff) | |
Merge from product-engine
Diffstat (limited to 'indra/newview/llchannelmanager.cpp')
| -rw-r--r-- | indra/newview/llchannelmanager.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llchannelmanager.cpp b/indra/newview/llchannelmanager.cpp index 3443d8b593..aa584b3ae8 100644 --- a/indra/newview/llchannelmanager.cpp +++ b/indra/newview/llchannelmanager.cpp @@ -37,7 +37,6 @@ #include "llappviewer.h" #include "llviewercontrol.h" #include "llimview.h" -#include "llbottomtray.h" #include "llviewerwindow.h" #include "llrootview.h" #include "llsyswellwindow.h" |