diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:05:16 -0800 |
| commit | 9cf8c3e654f38745c8a94cbd85609a17f482266a (patch) | |
| tree | 8cd1586fef29a307b9ab2bbe3711d289efdeb871 /indra/newview/llappviewer.cpp | |
| parent | 1f7bf9216869682aa88c9c92b6c15d2d5278902d (diff) | |
| parent | 77aa787c019615d2fe68d31aa07434301535c992 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 90b8cd9572..1ccb691fb3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -85,11 +85,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" |