diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-04-29 15:28:21 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-04-29 15:28:21 +0300 |
| commit | 5f397bdd1831b1be593982ca8fc88dbe1a0cad07 (patch) | |
| tree | 1d0b8a8973a30bf3c65f09da653b0e7c009053fd /indra/llcommon/llsdutil.h | |
| parent | 1382e9bae647d6b548cd9a1fc78339e5929ea202 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge from viewer-release
Diffstat (limited to 'indra/llcommon/llsdutil.h')
| -rwxr-xr-x | indra/llcommon/llsdutil.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h index d0b536c39a..99cb79aa54 100755 --- a/indra/llcommon/llsdutil.h +++ b/indra/llcommon/llsdutil.h @@ -126,7 +126,7 @@ LL_COMMON_API std::string llsd_matches(const LLSD& prototype, const LLSD& data, /// Deep equality. If you want to compare LLSD::Real values for approximate /// equality rather than bitwise equality, pass @a bits as for /// is_approx_equal_fraction(). -LL_COMMON_API bool llsd_equals(const LLSD& lhs, const LLSD& rhs, unsigned bits=-1); +LL_COMMON_API bool llsd_equals(const LLSD& lhs, const LLSD& rhs, int bits=-1); // Simple function to copy data out of input & output iterators if // there is no need for casting. |
