diff options
| author | UbitUmarov | 2012-08-03 15:21:29 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-08-03 15:21:29 +0100 |
| commit | a4c59b1fd2dd1fbf73a43981a9c729cef1001176 (patch) | |
| tree | 0387f56a6563887aa9e0c3b3eace74a7904e3fe5 | |
| parent | clientview IsActive use is broken. Suspend it's use keeping it true ( to (diff) | |
| download | opensim-SC_OLD-a4c59b1fd2dd1fbf73a43981a9c729cef1001176.zip opensim-SC_OLD-a4c59b1fd2dd1fbf73a43981a9c729cef1001176.tar.gz opensim-SC_OLD-a4c59b1fd2dd1fbf73a43981a9c729cef1001176.tar.bz2 opensim-SC_OLD-a4c59b1fd2dd1fbf73a43981a9c729cef1001176.tar.xz | |
minor change avoiding a null reference
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index bf2db58..c260fb2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2966,10 +2966,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2966 | try | 2966 | try |
| 2967 | { | 2967 | { |
| 2968 | ScenePresence sp = GetScenePresence(agentID); | 2968 | ScenePresence sp = GetScenePresence(agentID); |
| 2969 | PresenceService.LogoutAgent(sp.ControllingClient.SessionId); | 2969 | |
| 2970 | |||
| 2971 | if (sp != null) | 2970 | if (sp != null) |
| 2971 | { | ||
| 2972 | PresenceService.LogoutAgent(sp.ControllingClient.SessionId); | ||
| 2972 | sp.ControllingClient.Close(); | 2973 | sp.ControllingClient.Close(); |
| 2974 | } | ||
| 2973 | 2975 | ||
| 2974 | // BANG! SLASH! | 2976 | // BANG! SLASH! |
| 2975 | m_authenticateHandler.RemoveCircuit(agentID); | 2977 | m_authenticateHandler.RemoveCircuit(agentID); |