diff options
| author | Melanie | 2010-07-08 17:32:57 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-08 17:32:57 +0100 |
| commit | 5f400a50beb2b9d523e5a0fac643ca1cb247c9a6 (patch) | |
| tree | da874e34ef1c790f9b8ce9dc0533ac98755d783c /OpenSim/Region/Framework/Scenes | |
| parent | minimizes temp garbage for llParseStringKeepNulls() (diff) | |
| parent | llVecNorm() now returns a zero-length vector when one is supplied as input. A... (diff) | |
| download | opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.zip opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.gz opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.bz2 opensim-SC-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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; |