diff options
| author | Palmer <palmer@lindenlab.com> | 2010-01-29 15:05:28 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-01-29 15:05:28 -0800 |
| commit | bdb8ed5a0f70f8a7bf868448ef45e32e5beb8bdb (patch) | |
| tree | f56bc9b202f49f1ab631524684b7db41ae571f80 /indra/newview/llviewermenu.cpp | |
| parent | c504c40a754a79baf0e4b1d1c10ca44197d577df (diff) | |
| parent | 0bb7a85d06e7201887962000cb3e91bf456ffa09 (diff) | |
merge
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" |