Adds the ability to load more then one IClientNetworkServer thereby allowing additional client stacks. Use comma separated values in clientstack_plugin in your config.

2 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/TCPJSONStream/ClientNetworkContext.cs b/OpenSim/Region/ClientStack/TCPJSONStream/ClientNetworkContext.cs
index 591f817..b077b6a 100644
--- a/OpenSim/Region/ClientStack/TCPJSONStream/ClientNetworkContext.cs
+++ b/OpenSim/Region/ClientStack/TCPJSONStream/ClientNetworkContext.cs
@@ -55,6 +55,9 @@ namespace OpenSim.Region.ClientStack.TCPJSONStream
                 }
 
             }
+            catch (Exception)
+            {
+            }
         }
         /// <summary>
         /// send a whole buffer
diff --git a/OpenSim/Region/ClientStack/TCPJSONStream/TCPJsonWebSocketServer.cs b/OpenSim/Region/ClientStack/TCPJSONStream/TCPJsonWebSocketServer.cs
index 0713bf4..c0f6792 100644
--- a/OpenSim/Region/ClientStack/TCPJSONStream/TCPJsonWebSocketServer.cs
+++ b/OpenSim/Region/ClientStack/TCPJSONStream/TCPJsonWebSocketServer.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.ClientStack.TCPJSONStream
                 }
                 ClientNetworkContext context = new ClientNetworkContext((IPEndPoint) socket.RemoteEndPoint, _port,
                                                                         new NetworkStream(socket), 16384, socket);
-                HttpRequestParser parser;
+                //HttpRequestParser parser;
                 context.BeginRead();
 
             }