diff options
| author | Justin Clark-Casey (justincc) | 2014-09-24 00:45:19 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-09-24 00:50:24 +0100 |
| commit | c015cb3134b596386605b33232acf6f687cb71e0 (patch) | |
| tree | f82f3c9d86bf0f39c0f064ce5298c6e57d06d76f /OpenSim/Region/Framework | |
| parent | Add persistent command history in console (diff) | |
| download | opensim-SC-c015cb3134b596386605b33232acf6f687cb71e0.zip opensim-SC-c015cb3134b596386605b33232acf6f687cb71e0.tar.gz opensim-SC-c015cb3134b596386605b33232acf6f687cb71e0.tar.bz2 opensim-SC-c015cb3134b596386605b33232acf6f687cb71e0.tar.xz | |
Remove an unnecessary check at the bottom of Scene.CloseAgent()
At this point sp != null so no check required.
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 19cb0f8..eb2d6f0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4467,14 +4467,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4467 | sp.LifecycleState = ScenePresenceState.Removing; | 4467 | sp.LifecycleState = ScenePresenceState.Removing; |
| 4468 | } | 4468 | } |
| 4469 | 4469 | ||
| 4470 | if (sp != null) | 4470 | sp.ControllingClient.Close(force); |
| 4471 | { | ||
| 4472 | sp.ControllingClient.Close(force); | ||
| 4473 | return true; | ||
| 4474 | } | ||
| 4475 | 4471 | ||
| 4476 | // Agent not here | 4472 | return true; |
| 4477 | return false; | ||
| 4478 | } | 4473 | } |
| 4479 | 4474 | ||
| 4480 | /// <summary> | 4475 | /// <summary> |