diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 12:09:37 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 12:09:37 -0800 |
| commit | e2612effbe463cd89853d3d6a047b3aa7e275975 (patch) | |
| tree | 148fb7fb1bdbf84c148d8ccb6496a6fba7ef9afb /indra/newview/llviewermenu.cpp | |
| parent | 5a34cf1af83314774f11b0d24279794794bc9147 (diff) | |
| parent | fab60b8c05a89498bd8efeafdea8acfa5f94f06c (diff) | |
merge from viewer2
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 0801e53fbf..7f665a7d98 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" |