diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-01-29 15:58:36 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-01-29 15:58:36 +0200 |
| commit | bed3948c4fbeea6d912eb60ab93a24fb7cd7b7b4 (patch) | |
| tree | 980c9369b5c39e9d2fdc92f8054766b72c58c3a5 /indra/newview/llviewermenu.cpp | |
| parent | 10cbb9ea27e8e47a235efece1b30365b7f00e038 (diff) | |
| parent | f8bde94b9f9c83202f32268b57539fbe5c7cf271 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 96251f7571..f7f30a5136 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -53,7 +53,6 @@ #include "llfloaterbuycontents.h" #include "llfloaterbuycurrency.h" #include "llfloatercustomize.h" -#include "llfloaterchatterbox.h" #include "llfloatergodtools.h" #include "llfloaterinventory.h" #include "llfloaterland.h" @@ -82,7 +81,6 @@ #include "llsidetray.h" #include "llstatusbar.h" #include "lltextureview.h" -#include "lltoolbar.h" #include "lltoolcomp.h" #include "lltoolmgr.h" #include "lltoolpie.h" |