diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-03-04 19:47:07 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-03-04 19:47:07 +0000 |
| commit | dc27e10bdd158e0f57b3e07a5946cb8978b916e8 (patch) | |
| tree | 9c7f9658259310475aa3dc561b4bf82b03443d73 /indra/newview/lltooldraganddrop.cpp | |
| parent | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (diff) | |
svn merge -r 80852:81039 svn+ssh://svn.lindenlab.com/svn/linden/branches/security-steal-anything
QAR-347 "SEC-28 - It is possible to rez any object, whether you own it or not."
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index baff994bdd..f4de261240 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -2778,9 +2778,9 @@ EAcceptance LLToolDragAndDrop::dad3dRezFromObjectOnLand( LLViewerInventoryCategory* cat = NULL; locateInventory(item, cat); if(!item || !item->isComplete()) return ACCEPT_NO; - if(!item->getPermissions().allowCopyBy(gAgent.getID(), - gAgent.getGroupID()) - || !item->getPermissions().allowTransferTo(LLUUID::null)) + + if(!gAgent.allowOperation(PERM_COPY, item->getPermissions()) + || !item->getPermissions().allowTransferTo(LLUUID::null)) { return ACCEPT_NO_LOCKED; } |