ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2013-02-15 21:42:16 +00:00
parent 945bf9808c e09467b30d
commit ea8c5ba707
13 changed files with 270 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
View File

@@ -535,6 +535,8 @@ namespace OpenSim.Framework.Servers.HttpServer
/// <param name="message"></param>
public void Close(string message)
{
if (_networkContext == null)
return;
if (_networkContext.Stream != null)
{
if (_networkContext.Stream.CanWrite)