diff options
| author | Diva Canto | 2013-07-09 14:12:52 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-09 14:12:52 -0700 |
| commit | 67e500383eb024fe4dd2681d0c5d902f289b65d8 (patch) | |
| tree | f3523d8849fd573208869bf8e0aa8a77eb2c2077 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | BaseHttpServer: if the handler sets the content length, don't override it. Th... (diff) | |
| download | opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.zip opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.tar.gz opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.tar.bz2 opensim-SC_OLD-67e500383eb024fe4dd2681d0c5d902f289b65d8.tar.xz | |
Put guards on a bunch of exception-inducing code, as seen in logs from load test.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 355e0ee..54956ee 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3687,7 +3687,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3687 | "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.", | 3687 | "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.", |
| 3688 | sp.Name, sp.UUID, RegionInfo.RegionName); | 3688 | sp.Name, sp.UUID, RegionInfo.RegionName); |
| 3689 | 3689 | ||
| 3690 | sp.ControllingClient.Close(true); | 3690 | if (sp.ControllingClient != null) |
| 3691 | sp.ControllingClient.Close(true); | ||
| 3692 | |||
| 3691 | sp = null; | 3693 | sp = null; |
| 3692 | } | 3694 | } |
| 3693 | 3695 | ||