diff options
author | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:31:48 -0600 |
---|---|---|
committer | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:31:48 -0600 |
commit | 97ed20a12bc5b0c0a14534970146425bc854d7fb (patch) | |
tree | 7071c3750cf0b32c12c0fe32cfaecddcfa6da4f0 /indra/newview/tests | |
parent | 4cf16ffdfbb166fbb3fcf1d7950ca1a240c94ca1 (diff) | |
parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/tests')
-rwxr-xr-x | indra/newview/tests/llmediadataclient_test.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/tests/llmediadataclient_test.cpp b/indra/newview/tests/llmediadataclient_test.cpp index 41cb344808..3e55336f2d 100755 --- a/indra/newview/tests/llmediadataclient_test.cpp +++ b/indra/newview/tests/llmediadataclient_test.cpp @@ -39,6 +39,7 @@ #include "../llvovolume.h" #include "../../llprimitive/llmediaentry.cpp" +#include "../../llprimitive/llmaterialid.cpp" #include "../../llprimitive/lltextureentry.cpp" #include "../../llmessage/tests/llcurl_stub.cpp" |