diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:29:39 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:29:39 -0800 |
| commit | de23a4d92c02504fd512b2fdb151406d31ae03c0 (patch) | |
| tree | 09167a3f1a9bfd973f1167e99c1c5c8a26513299 /indra/newview/llchannelmanager.cpp | |
| parent | fb81795a2d009480482af13b536702002ed7c8f2 (diff) | |
| parent | dd9f2ca5f555d529d8f8b6168115ca3d3155fac7 (diff) | |
Merge
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" |