From a33b6eed6d09661445a638efcbb354b0330f9093 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Jun 2013 00:54:19 +0100
Subject: minor: remove mono compiler warnings in WebsocketServerHandler.cs
---
.../Servers/HttpServer/WebsocketServerHandler.cs | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
(limited to 'OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs')
diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
index ee96b47..de89e2e 100644
--- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Servers.HttpServer
///
/// This is a regular HTTP Request... This may be removed in the future.
///
- public event RegularHttpRequestDelegate OnRegularHttpRequest;
+// public event RegularHttpRequestDelegate OnRegularHttpRequest;
///
/// When the upgrade from a HTTP request to a Websocket is completed, this will be fired
@@ -304,15 +304,14 @@ namespace OpenSim.Framework.Servers.HttpServer
if (d != null)
d(this, new UpgradeCompletedEventArgs());
}
- catch (IOException fail)
+ catch (IOException)
{
Close(string.Empty);
}
- catch (ObjectDisposedException fail)
+ catch (ObjectDisposedException)
{
Close(string.Empty);
- }
-
+ }
}
///
@@ -414,8 +413,6 @@ namespace OpenSim.Framework.Servers.HttpServer
_socketState.Header = pheader;
}
-
-
if (_socketState.FrameComplete)
{
ProcessFrame(_socketState);
@@ -424,7 +421,6 @@ namespace OpenSim.Framework.Servers.HttpServer
_socketState.ExpectedBytes = 0;
}
-
}
}
else
@@ -457,8 +453,7 @@ namespace OpenSim.Framework.Servers.HttpServer
_socketState.ReceivedBytes.Clear();
_socketState.ExpectedBytes = 0;
// do some processing
- }
-
+ }
}
}
if (offset > 0)
@@ -477,13 +472,12 @@ namespace OpenSim.Framework.Servers.HttpServer
{
// We can't read the stream anymore...
}
-
}
- catch (IOException fail)
+ catch (IOException)
{
Close(string.Empty);
}
- catch (ObjectDisposedException fail)
+ catch (ObjectDisposedException)
{
Close(string.Empty);
}
--
cgit v1.1