diff options
author | UbitUmarov | 2018-01-15 16:23:19 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-15 16:23:19 +0000 |
commit | c92ba1cc04c36d46b3569c06d8339cf897af65cc (patch) | |
tree | 88fadaf244e29d229bc166c1b0ac031843b15a50 /OpenSim/Framework | |
parent | update PrimMesher to a newer version from dahlia (thx dahlia), targeted .net4.6 (diff) | |
download | opensim-SC-c92ba1cc04c36d46b3569c06d8339cf897af65cc.zip opensim-SC-c92ba1cc04c36d46b3569c06d8339cf897af65cc.tar.gz opensim-SC-c92ba1cc04c36d46b3569c06d8339cf897af65cc.tar.bz2 opensim-SC-c92ba1cc04c36d46b3569c06d8339cf897af65cc.tar.xz |
shut up some pesty warnings
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Monitoring/JobEngine.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs index 115871e..4a831e8 100644 --- a/OpenSim/Framework/Monitoring/JobEngine.cs +++ b/OpenSim/Framework/Monitoring/JobEngine.cs | |||
@@ -238,7 +238,7 @@ namespace OpenSim.Framework.Monitoring | |||
238 | break; | 238 | break; |
239 | } | 239 | } |
240 | } | 240 | } |
241 | catch(ObjectDisposedException e) | 241 | catch(ObjectDisposedException) |
242 | { | 242 | { |
243 | m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue", | 243 | m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue", |
244 | Name,m_jobQueue.Count); | 244 | Name,m_jobQueue.Count); |
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs index eb8ca0d..8ab5808 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs | |||
@@ -130,7 +130,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
130 | response.OutputStream.Flush(); | 130 | response.OutputStream.Flush(); |
131 | response.Send(); | 131 | response.Send(); |
132 | } | 132 | } |
133 | catch (Exception e) | 133 | // catch (Exception e) |
134 | catch | ||
134 | { | 135 | { |
135 | } | 136 | } |
136 | } | 137 | } |