aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorMelanie2010-07-08 17:32:57 +0100
committerMelanie2010-07-08 17:32:57 +0100
commit5f400a50beb2b9d523e5a0fac643ca1cb247c9a6 (patch)
treeda874e34ef1c790f9b8ce9dc0533ac98755d783c /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentminimizes temp garbage for llParseStringKeepNulls() (diff)
parentllVecNorm() now returns a zero-length vector when one is supplied as input. A... (diff)
downloadopensim-SC_OLD-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.zip
opensim-SC_OLD-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.gz
opensim-SC_OLD-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.bz2
opensim-SC_OLD-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.xz
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.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 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;