diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
commit | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (patch) | |
tree | a1fe4ac67d499a565ea98b390dedbeef0a62acc2 /indra/newview/llvovolume.cpp | |
parent | 27fd0d1a93da8a2ad1aa445e8d8258f9e910ae8c (diff) | |
parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index a207d3e050..ee54a938ba 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -63,6 +63,8 @@ #include "llmediadataclient.h" #include "llagent.h" #include "llviewermediafocus.h" +#include "lldatapacker.h" +#include "llvocache.h" const S32 MIN_QUIET_FRAMES_COALESCE = 30; const F32 FORCE_SIMPLE_RENDER_AREA = 512.f; |