diff options
| author | Tom Grimshaw | 2010-06-26 13:06:47 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-26 13:06:47 -0700 |
| commit | ed5dac7e82adfe639a2057ed5d531418277869d7 (patch) | |
| tree | 72389679aac8d39af0b8ef2b5258f72efa94d9ba /OpenSim | |
| parent | Fix a bug with DeRezObjects (check for a null remoteClient) (diff) | |
| download | opensim-SC_OLD-ed5dac7e82adfe639a2057ed5d531418277869d7.zip opensim-SC_OLD-ed5dac7e82adfe639a2057ed5d531418277869d7.tar.gz opensim-SC_OLD-ed5dac7e82adfe639a2057ed5d531418277869d7.tar.bz2 opensim-SC_OLD-ed5dac7e82adfe639a2057ed5d531418277869d7.tar.xz | |
Fix another nullref issue in DeRezSceneObject
Diffstat (limited to 'OpenSim')
| -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 83fd349..0380199 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1605,7 +1605,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1605 | } | 1605 | } |
| 1606 | 1606 | ||
| 1607 | // Handle god perms | 1607 | // Handle god perms |
| 1608 | if (Permissions.IsGod(remoteClient.AgentId)) | 1608 | if (remoteClient != null && Permissions.IsGod(remoteClient.AgentId)) |
| 1609 | { | 1609 | { |
| 1610 | permissionToTake = true; | 1610 | permissionToTake = true; |
| 1611 | permissionToTakeCopy = true; | 1611 | permissionToTakeCopy = true; |