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/CoreModules/ServiceConnectorsOut | |
| 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 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs index 221f815..e05d186 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | |||
| @@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | |||
| 81 | 81 | ||
| 82 | public void OnConnectionClose(IClientAPI client) | 82 | public void OnConnectionClose(IClientAPI client) |
| 83 | { | 83 | { |
| 84 | if (client == null) | ||
| 85 | return; | ||
| 86 | if (client.SceneAgent == null) | ||
| 87 | return; | ||
| 88 | |||
| 84 | if (client.SceneAgent.IsChildAgent) | 89 | if (client.SceneAgent.IsChildAgent) |
| 85 | return; | 90 | return; |
| 86 | 91 | ||