aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs9
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs23
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs10
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs8
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs26
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs7
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs11
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs15
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs16
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs5
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs18
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs17
16 files changed, 36 insertions, 136 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
index f593349..7a7af31 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
@@ -25,8 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29
30namespace OpenSim.ApplicationPlugins.Rest.Inventory 28namespace OpenSim.ApplicationPlugins.Rest.Inventory
31{ 29{
32 /// <summary> 30 /// <summary>
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
index 997c2d3..b27f9c5 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
@@ -25,7 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using OpenSim.Framework.Servers; 28using OpenSim.Framework.Servers;
30 29
31namespace OpenSim.ApplicationPlugins.Rest.Inventory 30namespace OpenSim.ApplicationPlugins.Rest.Inventory
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
index 20e619a..2ce5166 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
@@ -26,17 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using System.IO; 30using System.IO;
30using System.Reflection;
31using System.Text;
32using System.Security.Cryptography; 31using System.Security.Cryptography;
32using System.Text;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using System.Collections.Generic; 34using System.Xml;
35using System.Collections.Specialized;
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
38using OpenMetaverse;
39using System.Xml;
40 37
41namespace OpenSim.ApplicationPlugins.Rest.Inventory 38namespace OpenSim.ApplicationPlugins.Rest.Inventory
42{ 39{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index bfa27c3..2ac1001 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -30,18 +30,17 @@ using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Text; 32using System.Text;
33using log4net;
34using Nini.Config;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Servers;
35using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache;
37using Nini.Config;
38 37
39namespace OpenSim.ApplicationPlugins.Rest.Inventory 38namespace OpenSim.ApplicationPlugins.Rest.Inventory
40{ 39{
41 public class Rest 40 public class Rest
42 { 41 {
43 internal static readonly log4net.ILog Log = 42 internal static readonly ILog Log =
44 log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 44
46 internal static bool DEBUG = Log.IsDebugEnabled; 45 internal static bool DEBUG = Log.IsDebugEnabled;
47 46
@@ -468,25 +467,25 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
468 467
469 public static void Dump(byte[] data) 468 public static void Dump(byte[] data)
470 { 469 {
471 char[] buffer = new char[Rest.DumpLineSize]; 470 char[] buffer = new char[DumpLineSize];
472 int cc = 0; 471 int cc = 0;
473 472
474 for (int i = 0; i < data.Length; i++) 473 for (int i = 0; i < data.Length; i++)
475 { 474 {
476 if (i % Rest.DumpLineSize == 0) Console.Write("\n{0}: ",i.ToString("d8")); 475 if (i % DumpLineSize == 0) Console.Write("\n{0}: ",i.ToString("d8"));
477 476
478 if (i % 4 == 0) Console.Write(" "); 477 if (i % 4 == 0) Console.Write(" ");
479 478
480 Console.Write("{0}",data[i].ToString("x2")); 479 Console.Write("{0}",data[i].ToString("x2"));
481 480
482 if (data[i] < 127 && data[i] > 31) 481 if (data[i] < 127 && data[i] > 31)
483 buffer[i % Rest.DumpLineSize] = (char) data[i]; 482 buffer[i % DumpLineSize] = (char) data[i];
484 else 483 else
485 buffer[i % Rest.DumpLineSize] = '.'; 484 buffer[i % DumpLineSize] = '.';
486 485
487 cc++; 486 cc++;
488 487
489 if (i != 0 && (i + 1) % Rest.DumpLineSize == 0) 488 if (i != 0 && (i + 1) % DumpLineSize == 0)
490 { 489 {
491 Console.Write(" |"+(new String(buffer))+"|"); 490 Console.Write(" |"+(new String(buffer))+"|");
492 cc = 0; 491 cc = 0;
@@ -497,11 +496,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
497 496
498 if (cc != 0) 497 if (cc != 0)
499 { 498 {
500 for (int i = cc ; i < Rest.DumpLineSize; i++) 499 for (int i = cc ; i < DumpLineSize; i++)
501 { 500 {
502 if (i % 4 == 0) Console.Write(" "); 501 if (i % 4 == 0) Console.Write(" ");
503 Console.Write(" "); 502 Console.Write(" ");
504 buffer[i % Rest.DumpLineSize] = ' '; 503 buffer[i % DumpLineSize] = ' ';
505 } 504 }
506 Console.WriteLine(" |"+(new String(buffer))+"|"); 505 Console.WriteLine(" |"+(new String(buffer))+"|");
507 } 506 }
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 0775007..667cf57 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -27,18 +27,10 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.IO;
32using System.Threading;
33using System.Xml; 30using System.Xml;
34using System.Drawing; 31using OpenMetaverse;
35using OpenSim.Framework; 32using OpenSim.Framework;
36using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
37using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache;
39using OpenMetaverse;
40using OpenMetaverse.Imaging;
41using Nini.Config;
42 34
43namespace OpenSim.ApplicationPlugins.Rest.Inventory 35namespace OpenSim.ApplicationPlugins.Rest.Inventory
44{ 36{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
index 241bc90..2996030 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
@@ -25,17 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenMetaverse;
29using Nini.Config;
30using System; 28using System;
31using System.Collections.Generic;
32using System.IO;
33using System.Threading;
34using System.Xml; 29using System.Xml;
30using OpenMetaverse;
35using OpenSim.Framework; 31using OpenSim.Framework;
36using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
37using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache;
39 33
40namespace OpenSim.ApplicationPlugins.Rest.Inventory 34namespace OpenSim.ApplicationPlugins.Rest.Inventory
41{ 35{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index c022e09..81801df 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -28,9 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework;
32using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
33using OpenSim.ApplicationPlugins.Rest;
34 32
35namespace OpenSim.ApplicationPlugins.Rest.Inventory 33namespace OpenSim.ApplicationPlugins.Rest.Inventory
36{ 34{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index aa222bb..853b004 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -27,18 +27,18 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing;
31using System.Globalization;
30using System.IO; 32using System.IO;
31using System.Threading; 33using System.Threading;
32using System.Xml;
33using System.Drawing;
34using System.Timers; 34using System.Timers;
35using OpenSim.Framework; 35using System.Xml;
36using OpenSim.Framework.Servers;
37using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache;
39using OpenMetaverse; 36using OpenMetaverse;
40using OpenMetaverse.Imaging; 37using OpenMetaverse.Imaging;
41using Nini.Config; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Servers;
41using Timer=System.Timers.Timer;
42 42
43namespace OpenSim.ApplicationPlugins.Rest.Inventory 43namespace OpenSim.ApplicationPlugins.Rest.Inventory
44{ 44{
@@ -1931,19 +1931,19 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
1931 switch (ic.xml.Name) 1931 switch (ic.xml.Name)
1932 { 1932 {
1933 case "current": 1933 case "current":
1934 ic.CurrentPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1934 ic.CurrentPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1935 break; 1935 break;
1936 case "next": 1936 case "next":
1937 ic.NextPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1937 ic.NextPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1938 break; 1938 break;
1939 case "group": 1939 case "group":
1940 ic.GroupPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1940 ic.GroupPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1941 break; 1941 break;
1942 case "everyone": 1942 case "everyone":
1943 ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1943 ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1944 break; 1944 break;
1945 case "base": 1945 case "base":
1946 ic.BasePermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber); 1946 ic.BasePermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
1947 break; 1947 break;
1948 default: 1948 default:
1949 Rest.Log.DebugFormat("{0} Permissions: invalid attribute {1}:{2}", 1949 Rest.Log.DebugFormat("{0} Permissions: invalid attribute {1}:{2}",
@@ -2176,7 +2176,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
2176 internal UserProfileData userProfile = null; 2176 internal UserProfileData userProfile = null;
2177 internal InventoryFolderBase root = null; 2177 internal InventoryFolderBase root = null;
2178 internal bool timeout = false; 2178 internal bool timeout = false;
2179 internal System.Timers.Timer watchDog = new System.Timers.Timer(); 2179 internal Timer watchDog = new Timer();
2180 2180
2181 internal InventoryRequestData(OSHttpRequest request, OSHttpResponse response, string prefix) 2181 internal InventoryRequestData(OSHttpRequest request, OSHttpResponse response, string prefix)
2182 : base(request, response, prefix) 2182 : base(request, response, prefix)
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
index b7c9027..1e87996 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
@@ -26,17 +26,10 @@
26 * 26 *
27 */ 27 */
28 28
29using OpenMetaverse;
30using Nini.Config;
31using System; 29using System;
32using System.IO;
33using System.Collections.Generic; 30using System.Collections.Generic;
34using System.Reflection; 31using System.Reflection;
35using System.Threading;
36using OpenSim.Framework;
37using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache;
40 33
41namespace OpenSim.ApplicationPlugins.Rest.Inventory 34namespace OpenSim.ApplicationPlugins.Rest.Inventory
42{ 35{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
index a3f1d14..8c3ef75 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
@@ -26,8 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30
31namespace OpenSim.ApplicationPlugins.Rest.Inventory 29namespace OpenSim.ApplicationPlugins.Rest.Inventory
32{ 30{
33 31
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
index 4a98834..c81cb9f 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
@@ -25,18 +25,9 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenMetaverse;
29using Nini.Config;
30using System; 28using System;
31using System.Collections.Generic; 29using OpenMetaverse;
32using System.IO;
33using System.Threading;
34using System.Xml;
35using OpenSim.Framework;
36using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache;
40 31
41namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests 32namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests
42{ 33{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index 8537da5..959bae6e2 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -26,27 +26,12 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Threading;
30using System.Collections;
31using System.Collections.Generic;
32using System.IO; 29using System.IO;
33using System.Net;
34using System.Reflection;
35using System.Text.RegularExpressions;
36using System.Timers;
37using System.Xml;
38using System.Xml.Serialization; 30using System.Xml.Serialization;
39using OpenMetaverse; 31using OpenMetaverse;
40using Mono.Addins;
41using Nwc.XmlRpc;
42using Nini.Config;
43using OpenSim.Framework;
44using OpenSim.Framework.Console;
45using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
46using OpenSim.Framework.Communications;
47using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
49using OpenSim.ApplicationPlugins.Rest;
50 35
51namespace OpenSim.ApplicationPlugins.Rest.Regions 36namespace OpenSim.ApplicationPlugins.Rest.Regions
52{ 37{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
index ab7e1ec..aa93f28 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
@@ -26,27 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Threading;
30using System.Collections;
31using System.Collections.Generic;
32using System.IO; 29using System.IO;
33using System.Net;
34using System.Reflection;
35using System.Text.RegularExpressions;
36using System.Timers;
37using System.Xml;
38using System.Xml.Serialization;
39using OpenMetaverse; 30using OpenMetaverse;
40using Mono.Addins;
41using Nwc.XmlRpc;
42using Nini.Config;
43using OpenSim.Framework;
44using OpenSim.Framework.Console;
45using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
46using OpenSim.Framework.Communications;
47using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
49using OpenSim.ApplicationPlugins.Rest;
50 34
51namespace OpenSim.ApplicationPlugins.Rest.Regions 35namespace OpenSim.ApplicationPlugins.Rest.Regions
52{ 36{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
index 80c2aa3..b3815fa 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
@@ -25,13 +25,10 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using OpenMetaverse;
29using System; 28using System;
30using System.Collections;
31using System.Collections.Generic;
32using System.Xml.Serialization; 29using System.Xml.Serialization;
30using OpenMetaverse;
33using OpenSim.Framework; 31using OpenSim.Framework;
34using OpenSim.Region.Framework.Scenes;
35 32
36namespace OpenSim.ApplicationPlugins.Rest.Regions 33namespace OpenSim.ApplicationPlugins.Rest.Regions
37{ 34{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index 2d13b6b..fdfeb7d 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -26,25 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Threading;
30using System.Collections;
31using System.Collections.Generic;
32using System.IO;
33using System.Net;
34using System.Reflection;
35using System.Text.RegularExpressions;
36using System.Timers;
37using System.Xml;
38using System.Xml.Serialization; 29using System.Xml.Serialization;
39using OpenMetaverse;
40using Nwc.XmlRpc;
41using Nini.Config;
42using OpenSim.Framework;
43using OpenSim.Framework.Console;
44using OpenSim.Framework.Servers;
45using OpenSim.Framework.Communications;
46using OpenSim.Region.Framework.Scenes;
47using OpenSim.ApplicationPlugins.Rest;
48 30
49namespace OpenSim.ApplicationPlugins.Rest.Regions 31namespace OpenSim.ApplicationPlugins.Rest.Regions
50{ 32{
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>