diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
| commit | 6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch) | |
| tree | 86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/llcommon/llsdutil.cpp | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
| parent | 316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llsdutil.cpp')
| -rwxr-xr-x | indra/llcommon/llsdutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp index 562fd26658..6ad4a97149 100755 --- a/indra/llcommon/llsdutil.cpp +++ b/indra/llcommon/llsdutil.cpp @@ -572,7 +572,7 @@ std::string llsd_matches(const LLSD& prototype, const LLSD& data, const std::str return match_types(prototype.type(), TypeVector(), data.type(), pfx); } -bool llsd_equals(const LLSD& lhs, const LLSD& rhs, unsigned bits) +bool llsd_equals(const LLSD& lhs, const LLSD& rhs, int bits) { // We're comparing strict equality of LLSD representation rather than // performing any conversions. So if the types aren't equal, the LLSD |