aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authoronefang2019-06-04 00:50:59 +1000
committeronefang2019-06-04 00:50:59 +1000
commitcdb1851f438349a8721c0d9cef54837d0b302189 (patch)
tree1a1c7255ac4343ecf44bdd5387903f467a6b7626 /OpenSim/Framework
parentAdjust [AuthorizationService] sections to use the new DefaultRegionAccess. (diff)
downloadopensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.zip
opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.tar.gz
opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.tar.bz2
opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.tar.xz
Warnings--
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Monitoring/JobEngine.cs4
-rw-r--r--OpenSim/Framework/Monitoring/Stats/Stat.cs2
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs2
-rw-r--r--OpenSim/Framework/Util.cs2
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index 115871e..7264c25 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -194,7 +194,7 @@ namespace OpenSim.Framework.Monitoring
194 { 194 {
195 if(!IsRunning) 195 if(!IsRunning)
196 return false; 196 return false;
197 197
198 if(!m_threadRunnig) 198 if(!m_threadRunnig)
199 { 199 {
200 WorkManager.RunInThreadPool(ProcessRequests, null, Name, false); 200 WorkManager.RunInThreadPool(ProcessRequests, null, Name, false);
@@ -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/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 2402acd..2276341 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Framework.Monitoring
245 245
246 ret.Add("Value", OSD.FromReal(Value)); 246 ret.Add("Value", OSD.FromReal(Value));
247 247
248 double lastChangeOverTime, averageChangeOverTime; 248// double lastChangeOverTime, averageChangeOverTime;
249 249
250 return ret; 250 return ret;
251 } 251 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index fefcb20..60eca5f 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Servers.HttpServer
126 response.OutputStream.Flush(); 126 response.OutputStream.Flush();
127 response.Send(); 127 response.Send();
128 } 128 }
129 catch (Exception e) 129 catch
130 { 130 {
131 } 131 }
132 } 132 }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index a448b31..18d6e4a 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2691,7 +2691,7 @@ namespace OpenSim.Framework
2691 2691
2692 callback(o); 2692 callback(o);
2693 } 2693 }
2694 catch (ThreadAbortException e) 2694 catch (ThreadAbortException)
2695 { 2695 {
2696 } 2696 }
2697 catch (Exception e) 2697 catch (Exception e)