summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2011-05-13 17:09:40 -0700
committercallum <none@none>2011-05-13 17:09:40 -0700
commit889f6cc3b3603bc65ba3cfe19f919e87b3f12366 (patch)
tree7cd1dbda844d3a837df476738dabc255c8951a0a /indra/newview/llvovolume.cpp
parente4a9704d4157151442accca1116ad70f7f63ae95 (diff)
parent1e6d1879a01d57e8949add79fa4f3ef5d11c1c43 (diff)
Merge with tip
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;