diff options
| author | James Cook <james@lindenlab.com> | 2009-12-16 16:40:06 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-16 16:40:06 -0800 |
| commit | 3c06dc4df2d9ee11e7d346f902d34eaee17161a5 (patch) | |
| tree | 40c5342da322116d093268e0437736f860d62e0d /indra/newview/llappviewer.cpp | |
| parent | 4c0d5200bc7a53537f9ee7028e74c1feb4abc52e (diff) | |
| parent | c08699f900bf1560f61ea05e44449e90bb02c708 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a4dee14e40..becc30832d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -39,7 +39,6 @@ #include "llfeaturemanager.h" #include "lluictrlfactory.h" #include "lltexteditor.h" -#include "llalertdialog.h" #include "llerrorcontrol.h" #include "llviewertexturelist.h" #include "llgroupmgr.h" @@ -85,11 +84,14 @@ #include "llsecondlifeurls.h" // Linden library includes +#include "llimagej2c.h" #include "llmemory.h" #include "llprimitive.h" #include "llurlaction.h" +#include "llvfile.h" #include "llvfsthread.h" #include "llvolumemgr.h" +#include "llxfermanager.h" #include "llnotificationmanager.h" #include "llnotifications.h" @@ -109,7 +111,6 @@ #include "apr_dso.h" #include <boost/lexical_cast.hpp> -#include "llnotify.h" #include "llviewerkeyboard.h" #include "lllfsthread.h" #include "llworkerthread.h" |