diff options
| author | palange <palange@lindenlab.com> | 2009-10-12 19:03:52 -0400 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2009-10-12 19:03:52 -0400 |
| commit | dbe7135cc4694e906a7d95a935df70f20514c962 (patch) | |
| tree | 227ed3c9bc717171aeb009067e0f07335bcee8c3 /indra/llprimitive | |
| parent | d4b2897700c66354413af42ab055bd1aaa47f91c (diff) | |
| parent | e3a4e3dc10a96b0822674cea262f41774e55a660 (diff) | |
merge of login-api
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 2 | ||||
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 2 | ||||
| -rw-r--r-- | indra/llprimitive/tests/llmediaentry_test.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index d307d4bbfb..5ad758072c 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -43,7 +43,7 @@ #include "llvolumemgr.h" #include "llstring.h" #include "lldatapacker.h" -#include "llsdutil.h" +#include "llsdutil_math.h" #include "llprimtexturelist.h" /** diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 8f7cd68834..f75f1d9b8c 100644 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -35,7 +35,7 @@ #include "lluuid.h" #include "llmediaentry.h" #include "lltextureentry.h" -#include "llsdutil.h" +#include "llsdutil_math.h" #include "v4color.h" const U8 DEFAULT_BUMP_CODE = 0; // no bump or shininess diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp index 72478d0459..9ce6560923 100644 --- a/indra/llprimitive/tests/llmediaentry_test.cpp +++ b/indra/llprimitive/tests/llmediaentry_test.cpp @@ -157,7 +157,7 @@ namespace tut void ensure_llsd_equals(const std::string& msg, const LLSD& expected, const LLSD& actual) { - if (! llsd_equals(expected, actual)) + if (!tut::llsd_equals(expected, actual)) { std::string message = msg; message += ": actual: "; |