summaryrefslogtreecommitdiff
path: root/indra/llinventory/llpermissions.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-01 15:25:35 -0600
committerDave Parks <davep@lindenlab.com>2010-03-01 15:25:35 -0600
commit99b0d17833a8a2efab9c08edf2ada3718736a5ba (patch)
tree8951e7aabe026917d299436ebc28019f9966cd02 /indra/llinventory/llpermissions.cpp
parent746037362ed07af0c799caf22cf9e425744359a0 (diff)
parent7564813d608f79e6fc70e1f58a861c640d1b6fa2 (diff)
Merge with viewer-2-0
Diffstat (limited to 'indra/llinventory/llpermissions.cpp')
-rw-r--r--indra/llinventory/llpermissions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index d2e5034734..9683252dc4 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -479,7 +479,7 @@ BOOL LLPermissions::setNextOwnerBits(const LLUUID& agent, const LLUUID& group, B
return ownership;
}
-BOOL LLPermissions::allowOperationBy(PermissionBit op, const LLUUID& requester, const LLUUID& group) const
+bool LLPermissions::allowOperationBy(PermissionBit op, const LLUUID& requester, const LLUUID& group) const
{
if(requester.isNull())
{