diff options
| author | Brian McBee | 2007-11-25 04:33:18 +0000 |
|---|---|---|
| committer | Brian McBee | 2007-11-25 04:33:18 +0000 |
| commit | 21ce2b0979451e6103c9ff1a322441d62d16d258 (patch) | |
| tree | 37b259b0b1e38aff94fc7e394498702167c0e270 /OpenSim | |
| parent | fixed order of map block requests to grid server. flipped map texture, as it ... (diff) | |
| download | opensim-SC_OLD-21ce2b0979451e6103c9ff1a322441d62d16d258.zip opensim-SC_OLD-21ce2b0979451e6103c9ff1a322441d62d16d258.tar.gz opensim-SC_OLD-21ce2b0979451e6103c9ff1a322441d62d16d258.tar.bz2 opensim-SC_OLD-21ce2b0979451e6103c9ff1a322441d62d16d258.tar.xz | |
Ignore nullreferenceexception in removeclient. The avatar is already gone.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1ee0db0..735dddb 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
| @@ -934,6 +934,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 934 | { | 934 | { |
| 935 | avatar.Close(); | 935 | avatar.Close(); |
| 936 | } | 936 | } |
| 937 | catch (System.NullReferenceException NE) | ||
| 938 | { | ||
| 939 | //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway. | ||
| 940 | |||
| 941 | } | ||
| 937 | catch (Exception e) | 942 | catch (Exception e) |
| 938 | { | 943 | { |
| 939 | MainLog.Instance.Error("Scene.cs:RemoveClient exception: " + e.ToString()); | 944 | MainLog.Instance.Error("Scene.cs:RemoveClient exception: " + e.ToString()); |