diff options
| author | Geenz <geenz@geenzo.com> | 2013-06-19 15:47:57 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-06-19 15:47:57 -0400 |
| commit | 9c83d4b5b88a927c4365154663b1809a450ccb98 (patch) | |
| tree | d59d9d5c0e42058e09d73f4ca1c04f47ee55db6c /indra/newview/tests | |
| parent | 72159fd03ea02422e3c6acfbed9221a5326a9cc0 (diff) | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
Merge with 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" |