diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2009-01-17 01:29:45 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2009-01-17 01:29:45 +0000 |
| commit | 15a6d273cc00e1f4f9f9d56d8c878b46b283b289 (patch) | |
| tree | f4ac9fa1f96c6d246b571412ce6a67ee1837794d /indra/llinventory | |
| parent | 446c55538e1fb12d8a1feb541edf99c16bb29121 (diff) | |
svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llpermissions.cpp | 9 | ||||
| -rw-r--r-- | indra/llinventory/llpermissions.h | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index b610b2b54e..328ed4588b 100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp @@ -277,6 +277,15 @@ BOOL LLPermissions::setOwnerAndGroup( return allowed; } +// only call this if you know what you're doing +// there are usually perm-bit consequences when the +// ownerhsip changes +void LLPermissions::yesReallySetOwner(const LLUUID& owner, bool group_owned) +{ + mOwner = owner; + mIsGroupOwned = group_owned; +} + BOOL LLPermissions::deedToGroup(const LLUUID& agent, const LLUUID& group) { if(group.notNull() && (agent.isNull() || ((group == mGroup) diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h index 1c70ddb168..5587f8c3c8 100644 --- a/indra/llinventory/llpermissions.h +++ b/indra/llinventory/llpermissions.h @@ -224,6 +224,11 @@ public: // item. BOOL setOwnerAndGroup(const LLUUID& agent, const LLUUID& owner, const LLUUID& group, bool is_atomic); + // only call this if you know what you're doing + // there are usually perm-bit consequences when the + // ownerhsip changes + void yesReallySetOwner(const LLUUID& owner, bool group_owned); + // saves last owner, sets owner to uuid null, sets group // owned. group_id must be the group of the object (that's who it // is being deeded to) and the object must be group |