aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-12-30 02:31:43 +0000
committerMelanie2010-12-30 02:31:43 +0000
commit98769ed04019865d24741f0d70dd5ac430a4fbce (patch)
treed645a5103fe7ce886ab03512ad92d78de0080596
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentFix up a prior fix (refix the fixed fix :) (diff)
downloadopensim-SC_OLD-98769ed04019865d24741f0d70dd5ac430a4fbce.zip
opensim-SC_OLD-98769ed04019865d24741f0d70dd5ac430a4fbce.tar.gz
opensim-SC_OLD-98769ed04019865d24741f0d70dd5ac430a4fbce.tar.bz2
opensim-SC_OLD-98769ed04019865d24741f0d70dd5ac430a4fbce.tar.xz
Merge branch 'master' into careminster-presence-refactor
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index ee51e80..682c36d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -694,7 +694,7 @@ namespace OpenSim.Region.Framework.Scenes
694 else 694 else
695 { 695 {
696 // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item. 696 // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item.
697 if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) || m_permissions.BypassPermissions() || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)) 697 if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) && (m_permissions.BypassPermissions() || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)))
698 { 698 {
699 CreateNewInventoryItem( 699 CreateNewInventoryItem(
700 remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID, 700 remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Flags, callbackID,