diff options
author | lbsa71 | 2009-02-12 09:53:12 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-12 09:53:12 +0000 |
commit | 801da4346aeb3c08969c4845f5c595135a64470a (patch) | |
tree | 2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/ApplicationPlugins | |
parent | Thanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff) | |
download | opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.zip opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2 opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz |
* optimized usings.
Diffstat (limited to '')
21 files changed, 47 insertions, 153 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index bd98045..c988ad8 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -25,20 +25,19 @@ | |||
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 | ||
28 | using System; | ||
28 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
29 | using System.Reflection; | 30 | using System.Reflection; |
30 | using System.Threading; | 31 | using System.Threading; |
31 | using log4net; | 32 | using log4net; |
32 | using Nini.Config; | ||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.RegionLoader.Filesystem; | 34 | using OpenSim.Framework.RegionLoader.Filesystem; |
35 | using OpenSim.Framework.RegionLoader.Web; | 35 | using OpenSim.Framework.RegionLoader.Web; |
36 | 36 | using OpenSim.Region.CoreModules.Agent.AssetTransaction; | |
37 | using OpenSim.Region.CoreModules.Scripting.DynamicTexture; | ||
38 | using OpenSim.Region.CoreModules.Avatar.InstantMessage; | 37 | using OpenSim.Region.CoreModules.Avatar.InstantMessage; |
38 | using OpenSim.Region.CoreModules.Scripting.DynamicTexture; | ||
39 | using OpenSim.Region.CoreModules.Scripting.LoadImageURL; | 39 | using OpenSim.Region.CoreModules.Scripting.LoadImageURL; |
40 | using OpenSim.Region.CoreModules.Scripting.XMLRPC; | 40 | using OpenSim.Region.CoreModules.Scripting.XMLRPC; |
41 | using OpenSim.Region.CoreModules.Agent.AssetTransaction; | ||
42 | 41 | ||
43 | namespace OpenSim.ApplicationPlugins.LoadRegions | 42 | namespace OpenSim.ApplicationPlugins.LoadRegions |
44 | { | 43 | { |
@@ -88,7 +87,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions | |||
88 | if (!CheckRegionsForSanity(regionsToLoad)) | 87 | if (!CheckRegionsForSanity(regionsToLoad)) |
89 | { | 88 | { |
90 | m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); | 89 | m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations"); |
91 | System.Environment.Exit(1); | 90 | Environment.Exit(1); |
92 | } | 91 | } |
93 | 92 | ||
94 | for (int i = 0; i < regionsToLoad.Length; i++) | 93 | for (int i = 0; i < regionsToLoad.Length; i++) |
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 43ae818..d457d2b 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -27,20 +27,20 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
30 | using System.IO; | 31 | using System.IO; |
31 | using System.Net; | 32 | using System.Net; |
32 | using System.Reflection; | 33 | using System.Reflection; |
33 | using System.Timers; | 34 | using System.Timers; |
34 | using OpenMetaverse; | ||
35 | using log4net; | 35 | using log4net; |
36 | using Nini.Config; | 36 | using Nini.Config; |
37 | using Nwc.XmlRpc; | 37 | using Nwc.XmlRpc; |
38 | using OpenMetaverse; | ||
38 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | using OpenSim.Region.CoreModules.World.Terrain; | ||
40 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Region.CoreModules.World.Terrain; | ||
43 | using System.Collections.Generic; | ||
44 | 44 | ||
45 | namespace OpenSim.ApplicationPlugins.RemoteController | 45 | namespace OpenSim.ApplicationPlugins.RemoteController |
46 | { | 46 | { |
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 | ||
28 | using System; | ||
29 | |||
30 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 28 | namespace 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 | ||
28 | using System; | ||
29 | using OpenSim.Framework.Servers; | 28 | using OpenSim.Framework.Servers; |
30 | 29 | ||
31 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 30 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using System.IO; | 30 | using System.IO; |
30 | using System.Reflection; | ||
31 | using System.Text; | ||
32 | using System.Security.Cryptography; | 31 | using System.Security.Cryptography; |
32 | using System.Text; | ||
33 | using System.Text.RegularExpressions; | 33 | using System.Text.RegularExpressions; |
34 | using System.Collections.Generic; | 34 | using System.Xml; |
35 | using System.Collections.Specialized; | ||
36 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
38 | using OpenMetaverse; | ||
39 | using System.Xml; | ||
40 | 37 | ||
41 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 38 | namespace 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; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Text; | 32 | using System.Text; |
33 | using log4net; | ||
34 | using Nini.Config; | ||
33 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Servers; | ||
35 | using OpenSim.Framework.Communications; | 36 | using OpenSim.Framework.Communications; |
36 | using OpenSim.Framework.Communications.Cache; | ||
37 | using Nini.Config; | ||
38 | 37 | ||
39 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 38 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
31 | using System.IO; | ||
32 | using System.Threading; | ||
33 | using System.Xml; | 30 | using System.Xml; |
34 | using System.Drawing; | 31 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.Communications; | ||
38 | using OpenSim.Framework.Communications.Cache; | ||
39 | using OpenMetaverse; | ||
40 | using OpenMetaverse.Imaging; | ||
41 | using Nini.Config; | ||
42 | 34 | ||
43 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 35 | namespace 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 | ||
28 | using OpenMetaverse; | ||
29 | using Nini.Config; | ||
30 | using System; | 28 | using System; |
31 | using System.Collections.Generic; | ||
32 | using System.IO; | ||
33 | using System.Threading; | ||
34 | using System.Xml; | 29 | using System.Xml; |
30 | using OpenMetaverse; | ||
35 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Servers; | 32 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.Communications; | ||
38 | using OpenSim.Framework.Communications.Cache; | ||
39 | 33 | ||
40 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 34 | namespace 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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using OpenSim.Framework; | ||
32 | using OpenSim.Framework.Servers; | 31 | using OpenSim.Framework.Servers; |
33 | using OpenSim.ApplicationPlugins.Rest; | ||
34 | 32 | ||
35 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 33 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Drawing; | ||
31 | using System.Globalization; | ||
30 | using System.IO; | 32 | using System.IO; |
31 | using System.Threading; | 33 | using System.Threading; |
32 | using System.Xml; | ||
33 | using System.Drawing; | ||
34 | using System.Timers; | 34 | using System.Timers; |
35 | using OpenSim.Framework; | 35 | using System.Xml; |
36 | using OpenSim.Framework.Servers; | ||
37 | using OpenSim.Framework.Communications; | ||
38 | using OpenSim.Framework.Communications.Cache; | ||
39 | using OpenMetaverse; | 36 | using OpenMetaverse; |
40 | using OpenMetaverse.Imaging; | 37 | using OpenMetaverse.Imaging; |
41 | using Nini.Config; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications.Cache; | ||
40 | using OpenSim.Framework.Servers; | ||
41 | using Timer=System.Timers.Timer; | ||
42 | 42 | ||
43 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 43 | namespace 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 | ||
29 | using OpenMetaverse; | ||
30 | using Nini.Config; | ||
31 | using System; | 29 | using System; |
32 | using System.IO; | ||
33 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
34 | using System.Reflection; | 31 | using System.Reflection; |
35 | using System.Threading; | ||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Framework.Servers; | 32 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Framework.Communications; | ||
39 | using OpenSim.Framework.Communications.Cache; | ||
40 | 33 | ||
41 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 34 | namespace 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 | ||
29 | using System; | ||
30 | |||
31 | namespace OpenSim.ApplicationPlugins.Rest.Inventory | 29 | namespace 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 | ||
28 | using OpenMetaverse; | ||
29 | using Nini.Config; | ||
30 | using System; | 28 | using System; |
31 | using System.Collections.Generic; | 29 | using OpenMetaverse; |
32 | using System.IO; | ||
33 | using System.Threading; | ||
34 | using System.Xml; | ||
35 | using OpenSim.Framework; | ||
36 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Framework.Servers; | ||
38 | using OpenSim.Framework.Communications; | ||
39 | using OpenSim.Framework.Communications.Cache; | ||
40 | 31 | ||
41 | namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests | 32 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Threading; | ||
30 | using System.Collections; | ||
31 | using System.Collections.Generic; | ||
32 | using System.IO; | 29 | using System.IO; |
33 | using System.Net; | ||
34 | using System.Reflection; | ||
35 | using System.Text.RegularExpressions; | ||
36 | using System.Timers; | ||
37 | using System.Xml; | ||
38 | using System.Xml.Serialization; | 30 | using System.Xml.Serialization; |
39 | using OpenMetaverse; | 31 | using OpenMetaverse; |
40 | using Mono.Addins; | ||
41 | using Nwc.XmlRpc; | ||
42 | using Nini.Config; | ||
43 | using OpenSim.Framework; | ||
44 | using OpenSim.Framework.Console; | ||
45 | using OpenSim.Framework.Servers; | 32 | using OpenSim.Framework.Servers; |
46 | using OpenSim.Framework.Communications; | ||
47 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
48 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
49 | using OpenSim.ApplicationPlugins.Rest; | ||
50 | 35 | ||
51 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 36 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Threading; | ||
30 | using System.Collections; | ||
31 | using System.Collections.Generic; | ||
32 | using System.IO; | 29 | using System.IO; |
33 | using System.Net; | ||
34 | using System.Reflection; | ||
35 | using System.Text.RegularExpressions; | ||
36 | using System.Timers; | ||
37 | using System.Xml; | ||
38 | using System.Xml.Serialization; | ||
39 | using OpenMetaverse; | 30 | using OpenMetaverse; |
40 | using Mono.Addins; | ||
41 | using Nwc.XmlRpc; | ||
42 | using Nini.Config; | ||
43 | using OpenSim.Framework; | ||
44 | using OpenSim.Framework.Console; | ||
45 | using OpenSim.Framework.Servers; | 31 | using OpenSim.Framework.Servers; |
46 | using OpenSim.Framework.Communications; | ||
47 | using OpenSim.Region.Framework.Interfaces; | 32 | using OpenSim.Region.Framework.Interfaces; |
48 | using OpenSim.Region.Framework.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
49 | using OpenSim.ApplicationPlugins.Rest; | ||
50 | 34 | ||
51 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 35 | namespace 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 | ||
28 | using OpenMetaverse; | ||
29 | using System; | 28 | using System; |
30 | using System.Collections; | ||
31 | using System.Collections.Generic; | ||
32 | using System.Xml.Serialization; | 29 | using System.Xml.Serialization; |
30 | using OpenMetaverse; | ||
33 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework.Scenes; | ||
35 | 32 | ||
36 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 33 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Threading; | ||
30 | using System.Collections; | ||
31 | using System.Collections.Generic; | ||
32 | using System.IO; | ||
33 | using System.Net; | ||
34 | using System.Reflection; | ||
35 | using System.Text.RegularExpressions; | ||
36 | using System.Timers; | ||
37 | using System.Xml; | ||
38 | using System.Xml.Serialization; | 29 | using System.Xml.Serialization; |
39 | using OpenMetaverse; | ||
40 | using Nwc.XmlRpc; | ||
41 | using Nini.Config; | ||
42 | using OpenSim.Framework; | ||
43 | using OpenSim.Framework.Console; | ||
44 | using OpenSim.Framework.Servers; | ||
45 | using OpenSim.Framework.Communications; | ||
46 | using OpenSim.Region.Framework.Scenes; | ||
47 | using OpenSim.ApplicationPlugins.Rest; | ||
48 | 30 | ||
49 | namespace OpenSim.ApplicationPlugins.Rest.Regions | 31 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Threading; | ||
30 | using System.Collections; | ||
31 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
32 | using System.IO; | 30 | using System.IO; |
33 | using System.Net; | ||
34 | using System.Reflection; | 31 | using System.Reflection; |
35 | using System.Timers; | ||
36 | using System.Xml; | 32 | using System.Xml; |
37 | using OpenMetaverse; | 33 | using log4net; |
38 | using Nwc.XmlRpc; | ||
39 | using Nini.Config; | 34 | using Nini.Config; |
35 | using OpenMetaverse; | ||
40 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
41 | using OpenSim.Framework.Console; | ||
42 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
43 | using OpenSim.Framework.Communications; | ||
44 | using OpenSim.Region.Framework.Scenes; | ||
45 | 38 | ||
46 | namespace OpenSim.ApplicationPlugins.Rest | 39 | namespace 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> |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs index a93f89c..7f16a04 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs | |||
@@ -1,5 +1,4 @@ | |||
1 | using System.Reflection; | 1 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 2 | using System.Runtime.InteropServices; |
4 | 3 | ||
5 | // General Information about an assembly is controlled through the following | 4 | // General Information about an assembly is controlled through the following |
@@ -10,7 +9,7 @@ using System.Runtime.InteropServices; | |||
10 | [assembly: AssemblyConfiguration("")] | 9 | [assembly: AssemblyConfiguration("")] |
11 | [assembly: AssemblyCompany("Microsoft")] | 10 | [assembly: AssemblyCompany("Microsoft")] |
12 | [assembly: AssemblyProduct("OpenSim.ApplicationPlugins.ScriptEngine")] | 11 | [assembly: AssemblyProduct("OpenSim.ApplicationPlugins.ScriptEngine")] |
13 | [assembly: AssemblyCopyright("Copyright © Microsoft 2008")] | 12 | [assembly: AssemblyCopyright("Copyright © Microsoft 2008")] |
14 | [assembly: AssemblyTrademark("")] | 13 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 14 | [assembly: AssemblyCulture("")] |
16 | 15 | ||
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs index bc07ca7..edec35f 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -25,9 +25,7 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | ||
29 | using System.Reflection; | 28 | using System.Reflection; |
30 | using System.Text; | ||
31 | using log4net; | 29 | using log4net; |
32 | using Nini.Config; | 30 | using Nini.Config; |
33 | using OpenSim.Region.Framework.Interfaces; | 31 | using OpenSim.Region.Framework.Interfaces; |
diff --git a/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs b/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs index ae4e2f9..b4b5d5b 100644 --- a/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs +++ b/OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -24,8 +24,6 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
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 | using System; | ||
28 | using System.Collections.Generic; | ||
29 | using System.Reflection; | 27 | using System.Reflection; |
30 | using log4net; | 28 | using log4net; |
31 | 29 | ||