diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-11-18 18:26:14 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-11-18 18:26:14 +0200 |
| commit | 1ea7c51f7e3f012916c1f5e76100b9686ee3d35b (patch) | |
| tree | c3187978dc5a74b1255632ea7615b09501c08a27 /indra/newview/llchannelmanager.cpp | |
| parent | b3cb61a26a0e4c7bfc3c18fd2705325a795684b8 (diff) | |
| parent | f3e576eda24ab363ee280e52ae7fc3cdd2107321 (diff) | |
merge
--HG--
branch : 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" |