diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-16 16:01:32 -0400 |
| commit | 327c99cadbcbe15442eaee8e0625ade17dcda61f (patch) | |
| tree | 6d89ba35638ae7e0b439150034a0333b1dc4b397 /indra/llui/tests | |
| parent | e20099155378fd10f7997e36ae8ef150c8c5ad91 (diff) | |
| parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) | |
merge up to 3.5.2 development
Diffstat (limited to 'indra/llui/tests')
| -rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/tests/llurlmatch_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 8f0a48018f..c3f0e92cb0 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -31,7 +31,7 @@ #include "llurlentry_stub.cpp" #include "lltut.h" #include "../lluicolortable.h" -#include "../lluiimage.h" +#include "../llrender/lluiimage.h" #include <boost/regex.hpp> diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp index 109d3ca7bb..55c1efefef 100644 --- a/indra/llui/tests/llurlmatch_test.cpp +++ b/indra/llui/tests/llurlmatch_test.cpp @@ -28,7 +28,7 @@ #include "linden_common.h" #include "../llurlmatch.h" -#include "../lluiimage.h" +#include "../llrender/lluiimage.h" #include "lltut.h" // link seams |