From 6b05cfce2570509f74afecc803daaaea497af677 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Wed, 24 Sep 2014 00:45:19 +0100
Subject: [PATCH] Remove an unnecessary check at the bottom of
 Scene.CloseAgent()

At this point sp != null so no check required.
---
 OpenSim/Region/Framework/Scenes/Scene.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 906323a01b..40d92dd685 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4467,14 +4467,9 @@ namespace OpenSim.Region.Framework.Scenes
                 sp.LifecycleState = ScenePresenceState.Removing;
             }
 
-            if (sp != null)
-            {
-                sp.ControllingClient.Close(force);
-                return true;
-            }
+            sp.ControllingClient.Close(force);
 
-            // Agent not here 
-            return false;
+            return true;
         }
 
         /// <summary>