diff options
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs index cfb1605..bb8825b 100644 --- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs | |||
| @@ -535,6 +535,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 535 | /// <param name="message"></param> | 535 | /// <param name="message"></param> |
| 536 | public void Close(string message) | 536 | public void Close(string message) |
| 537 | { | 537 | { |
| 538 | if (_networkContext == null) | ||
| 539 | return; | ||
| 538 | if (_networkContext.Stream != null) | 540 | if (_networkContext.Stream != null) |
| 539 | { | 541 | { |
| 540 | if (_networkContext.Stream.CanWrite) | 542 | if (_networkContext.Stream.CanWrite) |