summaryrefslogtreecommitdiff
path: root/indra/llprimitive/tests
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-05-07 09:31:20 -0700
committerCallum Prentice <callum@lindenlab.com>2014-05-07 09:31:20 -0700
commitfbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (patch)
treeb5ac3f23c9fbd7dba299cd7aa2e8e4f812df98f6 /indra/llprimitive/tests
parent1953c569a6acfd731af2c459da7a6928be4aaf5b (diff)
parentd0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff)
Merge with viewer-release
Diffstat (limited to 'indra/llprimitive/tests')
-rwxr-xr-xindra/llprimitive/tests/llmediaentry_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp
index 16e5f894e2..b072ce3964 100755
--- a/indra/llprimitive/tests/llmediaentry_test.cpp
+++ b/indra/llprimitive/tests/llmediaentry_test.cpp
@@ -39,7 +39,7 @@
#include "llsdserialize.h"
#include "../llmediaentry.h"
-#include "lllslconstants.h"
+#include "indra_constants.h"
#define DEFAULT_MEDIA_ENTRY "<llsd>\n\
<map>\n\