diff options
author | Merov Linden <merov@lindenlab.com> | 2013-06-19 12:24:44 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-06-19 12:24:44 -0700 |
commit | b3c010ea7130331d454c480b82d1309bac712004 (patch) | |
tree | 8f5e2ba709ebd52400f2831785e0c07c3396815f /indra/newview/tests | |
parent | d65f09ebcafe6ca968236a9991961983d4cd7a47 (diff) | |
parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) |
Pull merge lindenlab/viewer-release
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" |