summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdutil.cpp
diff options
context:
space:
mode:
authorNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-23 22:43:05 +0200
committerNorthspring <pantera.polnocy@phoenixviewer.com>2015-04-23 22:43:05 +0200
commit942d72ec36aa0e8be1d1aac35ab679463741b2d1 (patch)
tree02f84efaf0effaccc11e48c161a45f6693ec61c5 /indra/llcommon/llsdutil.cpp
parent2eb07a7080a85e9a63a6f5aff49907b386b865d2 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
Merge
Diffstat (limited to 'indra/llcommon/llsdutil.cpp')
-rwxr-xr-xindra/llcommon/llsdutil.cpp2
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