aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/RestPlugin.cs')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs17
1 files changed, 5 insertions, 12 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index 58dd729..86de6de 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -26,22 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Threading;
30using System.Collections;
31using System.Collections.Generic; 29using System.Collections.Generic;
32using System.IO; 30using System.IO;
33using System.Net;
34using System.Reflection; 31using System.Reflection;
35using System.Timers;
36using System.Xml; 32using System.Xml;
37using OpenMetaverse; 33using log4net;
38using Nwc.XmlRpc;
39using Nini.Config; 34using Nini.Config;
35using OpenMetaverse;
40using OpenSim.Framework; 36using OpenSim.Framework;
41using OpenSim.Framework.Console;
42using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
43using OpenSim.Framework.Communications;
44using OpenSim.Region.Framework.Scenes;
45 38
46namespace OpenSim.ApplicationPlugins.Rest 39namespace OpenSim.ApplicationPlugins.Rest
47{ 40{
@@ -49,8 +42,8 @@ namespace OpenSim.ApplicationPlugins.Rest
49 { 42 {
50 #region properties 43 #region properties
51 44
52 protected static readonly log4net.ILog m_log = 45 protected static readonly ILog m_log =
53 log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
54 47
55 private IConfig _config; // Configuration source: Rest Plugins 48 private IConfig _config; // Configuration source: Rest Plugins
56 private IConfig _pluginConfig; // Configuration source: Plugin specific 49 private IConfig _pluginConfig; // Configuration source: Plugin specific
@@ -65,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.Rest
65 private string _godkey; 58 private string _godkey;
66 private int _reqk; 59 private int _reqk;
67 60
68 [ThreadStaticAttribute] 61 [ThreadStatic]
69 private static string _threadRequestID = String.Empty; 62 private static string _threadRequestID = String.Empty;
70 63
71 /// <summary> 64 /// <summary>