diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-11-18 17:27:21 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-11-18 17:27:21 +0200 |
| commit | f3e576eda24ab363ee280e52ae7fc3cdd2107321 (patch) | |
| tree | 61b380d935fe285699f23896c555cf4a242dd483 /indra/newview/llchannelmanager.cpp | |
| parent | fce52249abdba7a865f03c88692a45e8ff972763 (diff) | |
| parent | 0688ae8c51d1c6d79ed30bb10ad049fd5ce790ef (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" |