summaryrefslogtreecommitdiff
path: root/indra/llxml
diff options
context:
space:
mode:
authorNeal Orman <nyx@lindenlab.com>2009-07-14 15:14:46 +0000
committerNeal Orman <nyx@lindenlab.com>2009-07-14 15:14:46 +0000
commit56e045547951cdad356da38ba3da4251d58d3fb8 (patch)
tree7d7f14cbf9741b7e5b12f36a04062888b31aa8cd /indra/llxml
parent064e917e3d34fa04edf20a6d583819f194171ea7 (diff)
QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branch
Merging changes for first checkpoint of multiple textures branch as part of the avatar pipeline project (AVP). Functionality should be same as before, but sets up the structure that later changes build upon. Changes passed QA, merge conflicts were minimal and easily resolved. Contact Nyx with any problems with this code. -Nyx
Diffstat (limited to 'indra/llxml')
-rw-r--r--indra/llxml/llxmlnode.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index c983a14410..cc9e5cb351 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -48,6 +48,7 @@
#include "llthread.h" // LLThreadSafeRefCount
#include "llstring.h"
#include "llstringtable.h"
+#include "llfile.h"
class LLVector3;