Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-07-08 17:32:57 +01:00
18 changed files with 157 additions and 148 deletions

View File

@@ -1622,7 +1622,7 @@ namespace OpenSim.Region.Framework.Scenes
}
// Handle god perms
if (remoteClient != null && Permissions.IsGod(remoteClient.AgentId))
if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
{
permissionToTake = true;
permissionToTakeCopy = true;