From d273ba2ce2707c6a2fe45c08fdc2524aae19ad00 Mon Sep 17 00:00:00 2001 From: Brian McGroarty Date: Wed, 7 May 2008 20:48:38 +0000 Subject: Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated --- indra/llinventory/llpermissions.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'indra/llinventory/llpermissions.cpp') diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index 99a6313289..f816d54181 100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp @@ -826,7 +826,7 @@ LLXMLNode *LLPermissions::exportFileXML() const { LLXMLNode *ret = new LLXMLNode("permissions", FALSE); - ret->createChild("group_owned", TRUE)->setBoolValue(mIsGroupOwned); + ret->createChild("group_owned", TRUE)->setBoolValue(1, (const BOOL*)&mIsGroupOwned); ret->createChild("base_mask", FALSE)->setByteValue(4, (U8*)&mMaskBase, LLXMLNode::ENCODING_HEX); ret->createChild("owner_mask", FALSE)->setByteValue(4, (U8*)&mMaskOwner, LLXMLNode::ENCODING_HEX); @@ -869,11 +869,7 @@ bool LLPermissions::importXML(LLXMLNode* node) if (node->getChild("group_id", sub_node)) success = success && (1 == sub_node->getUUIDValue(1, &mGroup)); if (node->getChild("group_owned", sub_node)) - { - BOOL tmpbool = FALSE; - success = success && (1 == sub_node->getBoolValue(1, &tmpbool)); - mIsGroupOwned = (bool)tmpbool; - } + success = success && (1 == sub_node->getBoolValue(1, (BOOL*)&mIsGroupOwned)); if (!success) { lldebugs << "LLPermissions::importXML() failed for node named '" -- cgit v1.3