OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a bug with DeRezObjects (check for a null remoteClient)

avinationmerge
Tom Grimshaw 2010-06-26 12:38:08 -07:00
parent acab2a159d
commit bd19cf739a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1591,7 +1591,8 @@ namespace OpenSim.Region.Framework.Scenes
// So that we know the database is upto date,
// for when deleting the object from it
ForceSceneObjectBackup(grp);
if (remoteClient != null)
{
if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
permissionToTakeCopy = false;
if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
@ -1601,6 +1602,7 @@ namespace OpenSim.Region.Framework.Scenes
permissionToDelete = false;
}
}
// Handle god perms
if (Permissions.IsGod(remoteClient.AgentId))