diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
| commit | 562006aa5585a42418cae978516505035cd34d8d (patch) | |
| tree | f42488d1b07907937f5b9e236617d9f02297d32d /indra/newview/llappviewer.cpp | |
| parent | 9a8042d5a3edfd07727793a1939c3ab361ceec9a (diff) | |
| parent | 7cd1020f2953b776e1878e7b4e365d4b23e6b07b (diff) | |
Merge with SVN viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9fe02a8ead..19e1273dc6 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -34,8 +34,7 @@ #include "llappviewer.h" -#include "llprimitive.h" - +// Viewer includes #include "llversionviewer.h" #include "llfeaturemanager.h" #include "lluictrlfactory.h" @@ -80,7 +79,10 @@ // Linden library includes #include "llmemory.h" +#include "llprimitive.h" #include "llurlaction.h" +#include "llvfsthread.h" +#include "llvolumemgr.h" // Third party library includes #include <boost/bind.hpp> |