diff options
| author | Justin Clark-Casey (justincc) | 2013-02-15 00:28:00 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-15 00:28:00 +0000 |
| commit | 30a60d661f53b7370ce13c68d151cd399f2f6df6 (patch) | |
| tree | 220bddeac0454283a767834a77e541949fcb7414 /OpenSim/Framework | |
| parent | Add regression TestJsonList2Path() (diff) | |
| parent | * Handle null check on configs in module startup so that the the code can be ... (diff) | |
| download | opensim-SC-30a60d661f53b7370ce13c68d151cd399f2f6df6.zip opensim-SC-30a60d661f53b7370ce13c68d151cd399f2f6df6.tar.gz opensim-SC-30a60d661f53b7370ce13c68d151cd399f2f6df6.tar.bz2 opensim-SC-30a60d661f53b7370ce13c68d151cd399f2f6df6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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) |