aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-01-19 12:47:14 +0000
committerUbitUmarov2017-01-19 12:47:14 +0000
commit7651d60d72d16179ab95a1e1bc8ac6c17379f08f (patch)
tree27f6139e98e5f4f2b056b96ab54bd6745d2ac1ad /OpenSim/Region/Framework
parentobject CanMove is for in scene SOGs Icleints and SPs and permitions module is... (diff)
downloadopensim-SC-7651d60d72d16179ab95a1e1bc8ac6c17379f08f.zip
opensim-SC-7651d60d72d16179ab95a1e1bc8ac6c17379f08f.tar.gz
opensim-SC-7651d60d72d16179ab95a1e1bc8ac6c17379f08f.tar.bz2
opensim-SC-7651d60d72d16179ab95a1e1bc8ac6c17379f08f.tar.xz
fix a null check
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index b2801ea..e066c0a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -455,10 +455,11 @@ namespace OpenSim.Region.Framework.Scenes
455 if(sog == null || client == null) 455 if(sog == null || client == null)
456 return false; 456 return false;
457 457
458 ScenePresence sp = client.SceneAgent as ScenePresence; 458 if(client.SceneAgent == null)
459 if(sp == null)
460 return false; 459 return false;
461 460
461 ScenePresence sp = client.SceneAgent as ScenePresence;
462
462 MoveObjectHandler handler = OnMoveObject; 463 MoveObjectHandler handler = OnMoveObject;
463 if (handler != null) 464 if (handler != null)
464 { 465 {