summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2011-05-12 17:08:20 -0700
committerbrad kittenbrink <brad@lindenlab.com>2011-05-12 17:08:20 -0700
commitf7a01d7b338bcd9c7ee09022a6179b3c6710237d (patch)
treeff8b8f6b741d3b016570ef3f5809ae45ca270493 /indra/newview/llvovolume.cpp
parent6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff)
parent2661a4c2c9359f2c2cabce6f48704dc8fb481994 (diff)
Merge.
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r--indra/newview/llvovolume.cpp2
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;