diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
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 b859042..38a5456 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1622,7 +1622,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1622 | } | 1622 | } |
1623 | 1623 | ||
1624 | // Handle god perms | 1624 | // Handle god perms |
1625 | if (remoteClient != null && Permissions.IsGod(remoteClient.AgentId)) | 1625 | if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId)) |
1626 | { | 1626 | { |
1627 | permissionToTake = true; | 1627 | permissionToTake = true; |
1628 | permissionToTakeCopy = true; | 1628 | permissionToTakeCopy = true; |