diff options
| author | Melanie | 2013-02-15 21:42:16 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-15 21:42:16 +0000 |
| commit | ea8c5ba707f0c6afd98968b68d13ab03b151b75b (patch) | |
| tree | 9b67be5dd03a8012fb832590b05c550f869601fa /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| download | opensim-SC-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.zip opensim-SC-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.gz opensim-SC-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.bz2 opensim-SC-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
| -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) |