diff options
author | Merov Linden <merov@lindenlab.com> | 2011-10-14 16:49:11 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-10-14 16:49:11 -0700 |
commit | fc2bd1cce2e6c213fa682b9768d435a4e394a95e (patch) | |
tree | dba1adbac8c96a093a0dfd5f54b7eccd65bf2233 /indra/newview/llchatbar.cpp | |
parent | 4c6f04c50225a4a5494974c3a6e13bee76cfbb6f (diff) | |
parent | cf98cdf69f481dd473363d4a80a80f27e96f87e8 (diff) |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llchatbar.cpp')
-rw-r--r-- | indra/newview/llchatbar.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index fb3abb132b..d6095cce07 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -60,7 +60,6 @@ #include "llui.h" #include "llviewermenu.h" #include "lluictrlfactory.h" -#include "llbottomtray.h" // // Globals |