aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs9
-rw-r--r--OpenSim/Framework/AssetBase.cs2
-rw-r--r--OpenSim/Framework/AssetConfig.cs3
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs2
-rw-r--r--OpenSim/Framework/Cache.cs4
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs18
-rw-r--r--OpenSim/Framework/Client/IClientChat.cs3
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs1
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs1
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs5
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsUtil.cs1
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs3
-rw-r--r--OpenSim/Framework/Communications/GridInfoService.cs1
-rw-r--r--OpenSim/Framework/Communications/IAvatarService.cs3
-rw-r--r--OpenSim/Framework/Communications/IHyperlink.cs5
-rw-r--r--OpenSim/Framework/Communications/ISecureInventoryService.cs4
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs6
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs4
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs4
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs2
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs7
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs2
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs10
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs7
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppError.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs2
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppSerializer.cs4
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppStanza.cs1
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppWriter.cs1
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs2
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs17
-rw-r--r--OpenSim/Framework/ForeignUserProfileData.cs2
-rw-r--r--OpenSim/Framework/HGNetworkServersInfo.cs4
-rw-r--r--OpenSim/Framework/IClientFileTransfer.cs5
-rw-r--r--OpenSim/Framework/IMoneyModule.cs2
-rw-r--r--OpenSim/Framework/IPlugin.cs2
-rw-r--r--OpenSim/Framework/IScene.cs1
-rw-r--r--OpenSim/Framework/InventoryNodeBase.cs4
-rw-r--r--OpenSim/Framework/LandData.cs6
-rw-r--r--OpenSim/Framework/Servers/BaseHTTPHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs16
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs5
-rw-r--r--OpenSim/Framework/Servers/BaseStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/BinaryStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/IHttpAgentHandler.cs4
-rw-r--r--OpenSim/Framework/Servers/IStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/OSHttpRequest.cs2
-rw-r--r--OpenSim/Framework/Servers/OSHttpResponse.cs2
-rw-r--r--OpenSim/Framework/Servers/RestDeserialiseHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/RestHTTPHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/RestSessionService.cs2
-rw-r--r--OpenSim/Framework/Servers/RestStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/Tests/OSHttpTests.cs9
-rw-r--r--OpenSim/Framework/SimStats.cs7
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsCollector.cs1
-rw-r--r--OpenSim/Framework/Tests/LocationTest.cs2
-rw-r--r--OpenSim/Framework/Tests/UtilTest.cs2
-rw-r--r--OpenSim/Framework/UserConfig.cs3
-rw-r--r--OpenSim/Framework/Util.cs10
-rw-r--r--OpenSim/Framework/WearableItem.cs2
69 files changed, 87 insertions, 176 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 9d40af9..1c37601 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -28,10 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OSD = OpenMetaverse.StructuredData.OSD; 31using OpenMetaverse.StructuredData;
32using OSDMap = OpenMetaverse.StructuredData.OSDMap;
33using OSDArray = OpenMetaverse.StructuredData.OSDArray;
34using OSDParser = OpenMetaverse.StructuredData.OSDParser;
35 32
36namespace OpenSim.Framework 33namespace OpenSim.Framework
37{ 34{
@@ -108,13 +105,13 @@ namespace OpenSim.Framework
108 if (args["caps_path"] != null) 105 if (args["caps_path"] != null)
109 CapsPath = args["caps_path"].AsString(); 106 CapsPath = args["caps_path"].AsString();
110 107
111 if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OpenMetaverse.StructuredData.OSDType.Array)) 108 if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OSDType.Array))
112 { 109 {
113 OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]); 110 OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]);
114 ChildrenCapSeeds = new Dictionary<ulong, string>(); 111 ChildrenCapSeeds = new Dictionary<ulong, string>();
115 foreach (OSD o in childrenSeeds) 112 foreach (OSD o in childrenSeeds)
116 { 113 {
117 if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) 114 if (o.Type == OSDType.Map)
118 { 115 {
119 ulong handle = 0; 116 ulong handle = 0;
120 string seed = ""; 117 string seed = "";
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 88ac4a6..dfe559e 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using OpenMetaverse; 29using OpenMetaverse;
31using OpenMetaverse.StructuredData;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
34{ 32{
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index cc0217f..233c3d0 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
31{ 32{
@@ -62,7 +63,7 @@ namespace OpenSim.Framework
62 63
63 configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 64 configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
64 "Location of 'AssetSets.xml'", 65 "Location of 'AssetSets.xml'",
65 string.Format(".{0}assets{0}AssetSets.xml", System.IO.Path.DirectorySeparatorChar), false); 66 string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar), false);
66 } 67 }
67 68
68 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 69 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 55b4ebd..01cbfce 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using OpenMetaverse;
34using log4net; 33using log4net;
35using Nini.Config; 34using Nini.Config;
35using OpenMetaverse;
36 36
37/// <summary> 37/// <summary>
38/// Loads assets from the filesystem location. Not yet a plugin, though it should be. 38/// Loads assets from the filesystem location. Not yet a plugin, though it should be.
diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs
index 6c37c66..3dab9b6 100644
--- a/OpenSim/Framework/Cache.cs
+++ b/OpenSim/Framework/Cache.cs
@@ -383,7 +383,7 @@ namespace OpenSim.Framework
383 383
384 // Find an object in cache by delegate. 384 // Find an object in cache by delegate.
385 // 385 //
386 public Object Find(Predicate<OpenSim.Framework.CacheItemBase> d) 386 public Object Find(Predicate<CacheItemBase> d)
387 { 387 {
388 CacheItemBase item = m_Index.Find(d); 388 CacheItemBase item = m_Index.Find(d);
389 389
@@ -460,7 +460,7 @@ namespace OpenSim.Framework
460 460
461 if (m_DefaultTTL.Ticks != 0) 461 if (m_DefaultTTL.Ticks != 0)
462 { 462 {
463 DateTime now= System.DateTime.Now; 463 DateTime now= DateTime.Now;
464 464
465 foreach (CacheItemBase item in new List<CacheItemBase>(m_Index)) 465 foreach (CacheItemBase item in new List<CacheItemBase>(m_Index))
466 { 466 {
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 34f2866..0e72e47 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -26,14 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenMetaverse;
30using System.Collections; 29using System.Collections;
31using System.Collections.Generic; 30using System.Collections.Generic;
32 31using OpenMetaverse;
33using OSD = OpenMetaverse.StructuredData.OSD; 32using OpenMetaverse.StructuredData;
34using OSDMap = OpenMetaverse.StructuredData.OSDMap;
35using OSDArray = OpenMetaverse.StructuredData.OSDArray;
36using OSDParser = OpenMetaverse.StructuredData.OSDParser;
37 33
38namespace OpenSim.Framework 34namespace OpenSim.Framework
39{ 35{
@@ -486,7 +482,7 @@ namespace OpenSim.Framework
486 if (args["agent_access"] != null) 482 if (args["agent_access"] != null)
487 Byte.TryParse(args["agent_access"].AsString(), out AgentAccess); 483 Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
488 484
489 if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OpenMetaverse.StructuredData.OSDType.Array) 485 if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
490 { 486 {
491 OSDArray textures = (OSDArray)(args["agent_textures"]); 487 OSDArray textures = (OSDArray)(args["agent_textures"]);
492 AgentTextures = new UUID[textures.Count]; 488 AgentTextures = new UUID[textures.Count];
@@ -498,28 +494,28 @@ namespace OpenSim.Framework
498 if (args["active_group_id"] != null) 494 if (args["active_group_id"] != null)
499 ActiveGroupID = args["active_group_id"].AsUUID(); 495 ActiveGroupID = args["active_group_id"].AsUUID();
500 496
501 if ((args["groups"] != null) && (args["groups"]).Type == OpenMetaverse.StructuredData.OSDType.Array) 497 if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array)
502 { 498 {
503 OSDArray groups = (OSDArray)(args["groups"]); 499 OSDArray groups = (OSDArray)(args["groups"]);
504 Groups = new AgentGroupData[groups.Count]; 500 Groups = new AgentGroupData[groups.Count];
505 int i = 0; 501 int i = 0;
506 foreach (OSD o in groups) 502 foreach (OSD o in groups)
507 { 503 {
508 if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) 504 if (o.Type == OSDType.Map)
509 { 505 {
510 Groups[i++] = new AgentGroupData((OSDMap)o); 506 Groups[i++] = new AgentGroupData((OSDMap)o);
511 } 507 }
512 } 508 }
513 } 509 }
514 510
515 if ((args["animations"] != null) && (args["animations"]).Type == OpenMetaverse.StructuredData.OSDType.Array) 511 if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array)
516 { 512 {
517 OSDArray anims = (OSDArray)(args["animations"]); 513 OSDArray anims = (OSDArray)(args["animations"]);
518 Anims = new AgentAnimationData[anims.Count]; 514 Anims = new AgentAnimationData[anims.Count];
519 int i = 0; 515 int i = 0;
520 foreach (OSD o in anims) 516 foreach (OSD o in anims)
521 { 517 {
522 if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) 518 if (o.Type == OSDType.Map)
523 { 519 {
524 Anims[i++] = new AgentAnimationData((OSDMap)o); 520 Anims[i++] = new AgentAnimationData((OSDMap)o);
525 } 521 }
diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs
index c89bf53..078ea9b 100644
--- a/OpenSim/Framework/Client/IClientChat.cs
+++ b/OpenSim/Framework/Client/IClientChat.cs
@@ -25,9 +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 System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework.Client 30namespace OpenSim.Framework.Client
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 2296e46..1c8f9d6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -29,11 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading; 31using System.Threading;
32using GlynnTucker.Cache;
33using log4net;
32using OpenMetaverse; 34using OpenMetaverse;
33using OpenMetaverse.Packets; 35using OpenMetaverse.Packets;
34using log4net;
35using OpenSim.Framework.Statistics; 36using OpenSim.Framework.Statistics;
36using GlynnTucker.Cache;
37 37
38namespace OpenSim.Framework.Communications.Cache 38namespace OpenSim.Framework.Communications.Cache
39{ 39{
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index cc5ba8e..5c902ec 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -28,11 +28,11 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Threading; 30using System.Threading;
31using OpenMetaverse;
32using log4net; 31using log4net;
32using OpenMetaverse;
33using OpenSim.Data;
33using OpenSim.Framework.AssetLoader.Filesystem; 34using OpenSim.Framework.AssetLoader.Filesystem;
34using OpenSim.Framework.Statistics; 35using OpenSim.Framework.Statistics;
35using OpenSim.Data;
36 36
37namespace OpenSim.Framework.Communications.Cache 37namespace OpenSim.Framework.Communications.Cache
38{ 38{
diff --git a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs b/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
index be10e96..d56e48a 100644
--- a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31 30
32namespace OpenSim.Framework.Communications.Cache 31namespace OpenSim.Framework.Communications.Cache
33{ 32{
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 99a982b..15066cd 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -28,10 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading;
32
33using OpenMetaverse;
34using log4net; 31using log4net;
32using OpenMetaverse;
35 33
36namespace OpenSim.Framework.Communications.Cache 34namespace OpenSim.Framework.Communications.Cache
37{ 35{
diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
index 038c591..55db289 100644
--- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://www.openmetaverse.org/ 2 * Copyright (c) Contributors, http://www.openmetaverse.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 *
@@ -34,11 +34,11 @@ using System;
34using System.Collections.Generic; 34using System.Collections.Generic;
35using System.IO; 35using System.IO;
36using System.Reflection; 36using System.Reflection;
37using System.Security.Cryptography;
37using System.Text; 38using System.Text;
38using System.Xml.Serialization; 39using System.Xml.Serialization;
39using log4net; 40using log4net;
40using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
41using System.Security.Cryptography;
42 42
43namespace OpenSim.Framework.Communications.Cache 43namespace OpenSim.Framework.Communications.Cache
44{ 44{
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 4c629f4..58c3269 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31
31//using System.Reflection; 32//using System.Reflection;
32 33
33//using log4net; 34//using log4net;
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 0b05adf..93f126f 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -30,9 +30,9 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using OpenMetaverse;
34using log4net; 33using log4net;
35using Nini.Config; 34using Nini.Config;
35using OpenMetaverse;
36 36
37namespace OpenSim.Framework.Communications.Cache 37namespace OpenSim.Framework.Communications.Cache
38{ 38{
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 22aab10..ef190c8 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -25,12 +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 System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Reflection; 29using System.Reflection;
31using System.Threading;
32using OpenMetaverse;
33using log4net; 30using log4net;
31using OpenMetaverse;
34 32
35namespace OpenSim.Framework.Communications.Cache 33namespace OpenSim.Framework.Communications.Cache
36{ 34{
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index cfe9002..b68083e 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -30,11 +30,10 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
35using OpenSim.Framework.Communications.Cache; 34using OpenMetaverse;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Framework; 36
38// using OpenSim.Region.Framework.Interfaces; 37// using OpenSim.Region.Framework.Interfaces;
39 38
40namespace OpenSim.Framework.Communications.Capabilities 39namespace OpenSim.Framework.Communications.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs b/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
index 829b4e5..874a27f 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsUtil.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 OpenMetaverse; 28using OpenMetaverse;
30 29
31namespace OpenSim.Framework.Communications.Capabilities 30namespace OpenSim.Framework.Communications.Capabilities
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index c68a205..906f5d5 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.Collections; 28using System.Collections;
29using System.IO; 29using System.IO;
30using System.Net;
31using System.Text; 30using System.Text;
32using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
33 32
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 2107f63..936e583 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -25,11 +25,8 @@
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 System.Collections.Generic; 28using System.Collections.Generic;
30using System.Reflection;
31using OpenMetaverse; 29using OpenMetaverse;
32using log4net;
33using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
35 32
diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
index bd108c1..488ce8e 100644
--- a/OpenSim/Framework/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -34,7 +34,6 @@ using log4net;
34using Nini.Config; 34using Nini.Config;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework;
38 37
39namespace OpenSim.Framework.Communications 38namespace OpenSim.Framework.Communications
40{ 39{
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs
index 25b26dd..3822e9f 100644
--- a/OpenSim/Framework/Communications/IAvatarService.cs
+++ b/OpenSim/Framework/Communications/IAvatarService.cs
@@ -25,9 +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 System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework.Communications 30namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/IHyperlink.cs b/OpenSim/Framework/Communications/IHyperlink.cs
index fa088d6..6c61d82 100644
--- a/OpenSim/Framework/Communications/IHyperlink.cs
+++ b/OpenSim/Framework/Communications/IHyperlink.cs
@@ -25,11 +25,6 @@
25 * OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THE POSSIBILITY OF SUCH DAMAGE.
26 * 26 *
27 */ 27 */
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32using OpenSim.Framework;
33 28
34namespace OpenSim.Framework.Communications 29namespace OpenSim.Framework.Communications
35{ 30{
diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs
index 6d4ce46..6da13fe 100644
--- a/OpenSim/Framework/Communications/ISecureInventoryService.cs
+++ b/OpenSim/Framework/Communications/ISecureInventoryService.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 27
28using System.Collections.Generic;
29using OpenMetaverse; 28using OpenMetaverse;
30using OpenSim.Framework.Communications.Cache;
31 29
32namespace OpenSim.Framework.Communications 30namespace OpenSim.Framework.Communications
33{ 31{
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 8753c64..de76415 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -25,14 +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 System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Reflection; 29using System.Reflection;
31using System.Threading;
32
33using OpenMetaverse;
34using log4net; 30using log4net;
35 31using OpenMetaverse;
36using OpenSim.Data; 32using OpenSim.Data;
37 33
38namespace OpenSim.Framework.Communications 34namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 867e9e6..d1b9258 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -29,10 +29,10 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using OpenMetaverse.StructuredData;
34using log4net; 32using log4net;
35using Nwc.XmlRpc; 33using Nwc.XmlRpc;
34using OpenMetaverse;
35using OpenMetaverse.StructuredData;
36 36
37namespace OpenSim.Framework.Communications 37namespace OpenSim.Framework.Communications
38{ 38{
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index fe904b5..ae16715 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -33,10 +33,10 @@ using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using System.Threading; 34using System.Threading;
35using System.Web; 35using System.Web;
36using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using log4net; 36using log4net;
39using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenMetaverse;
39using OpenMetaverse.StructuredData;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
42 42
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 970f2a9..69932fc 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -291,7 +291,7 @@ namespace OpenSim.Framework.Communications
291 { 291 {
292 _response = (HttpWebResponse) _request.GetResponse(); 292 _response = (HttpWebResponse) _request.GetResponse();
293 } 293 }
294 catch (System.Net.WebException e) 294 catch (WebException e)
295 { 295 {
296 m_log.ErrorFormat("[ASSET] Error fetching asset from asset server"); 296 m_log.ErrorFormat("[ASSET] Error fetching asset from asset server");
297 m_log.Debug(e.ToString()); 297 m_log.Debug(e.ToString());
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 86d85b1..cda9d5c 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -25,16 +25,13 @@
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 log4net;
30using NUnit.Framework; 28using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 29using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 30using OpenMetaverse;
33//using OpenSim.Framework; 31using OpenSim.Data;
34using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Communications.Local;
36using OpenSim.Tests.Common.Mock; 33using OpenSim.Tests.Common.Mock;
37using OpenSim.Data; 34//using OpenSim.Framework;
38 35
39namespace OpenSim.Framework.Communications.Tests 36namespace OpenSim.Framework.Communications.Tests
40{ 37{
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
index cf07ae5..85cc940 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
@@ -26,10 +26,8 @@
26 */ 26 */
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework.Communications;
30using OpenSim.Framework.Communications.Cache; 29using OpenSim.Framework.Communications.Cache;
31using OpenSim.Region.Communications.Local; 30using OpenSim.Region.Communications.Local;
32using OpenSim.Tests.Common.Mock;
33 31
34namespace OpenSim.Framework.Communications.Tests 32namespace OpenSim.Framework.Communications.Tests
35{ 33{
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index ffa3c5f..57ed0f5 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -29,8 +29,6 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Net; 30using System.Net;
31using System.Text.RegularExpressions; 31using System.Text.RegularExpressions;
32using System.Xml;
33using Nini;
34using NUnit.Framework; 32using NUnit.Framework;
35using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
36using Nwc.XmlRpc; 34using Nwc.XmlRpc;
@@ -61,7 +59,7 @@ namespace OpenSim.Framework.Communications.Tests
61 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123); 59 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
62 60
63 CommunicationsManager commsManager 61 CommunicationsManager commsManager
64 = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43)); 62 = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
65 63
66 commsManager.GridService.RegisterRegion( 64 commsManager.GridService.RegisterRegion(
67 new RegionInfo(42, 43, capsEndPoint, regionExternalName)); 65 new RegionInfo(42, 43, capsEndPoint, regionExternalName));
@@ -89,7 +87,7 @@ namespace OpenSim.Framework.Communications.Tests
89 Assert.That(responseData["first_name"], Is.EqualTo(firstName)); 87 Assert.That(responseData["first_name"], Is.EqualTo(firstName));
90 Assert.That(responseData["last_name"], Is.EqualTo(lastName)); 88 Assert.That(responseData["last_name"], Is.EqualTo(lastName));
91 Assert.That( 89 Assert.That(
92 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); 90 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
93 91
94 Regex capsSeedPattern 92 Regex capsSeedPattern
95 = new Regex("^http://" 93 = new Regex("^http://"
@@ -108,7 +106,7 @@ namespace OpenSim.Framework.Communications.Tests
108 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123); 106 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
109 107
110 CommunicationsManager commsManager 108 CommunicationsManager commsManager
111 = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43)); 109 = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
112 110
113 commsManager.GridService.RegisterRegion( 111 commsManager.GridService.RegisterRegion(
114 new RegionInfo(42, 43, capsEndPoint, regionExternalName)); 112 new RegionInfo(42, 43, capsEndPoint, regionExternalName));
@@ -159,7 +157,7 @@ namespace OpenSim.Framework.Communications.Tests
159 Hashtable invlibroothash = (Hashtable) invlibroot[0]; 157 Hashtable invlibroothash = (Hashtable) invlibroot[0];
160 Assert.That(invlibroothash["folder_id"],Is.EqualTo("00000112-000f-0000-0000-000100bba000")); 158 Assert.That(invlibroothash["folder_id"],Is.EqualTo("00000112-000f-0000-0000-000100bba000"));
161 Assert.That( 159 Assert.That(
162 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); 160 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
163 Assert.That(responseData["message"], Is.EqualTo("Hello folks")); 161 Assert.That(responseData["message"], Is.EqualTo("Hello folks"));
164 Assert.That(responseData["buddy-list"], Is.Empty); 162 Assert.That(responseData["buddy-list"], Is.Empty);
165 Assert.That(responseData["start_location"], Is.EqualTo("last")); 163 Assert.That(responseData["start_location"], Is.EqualTo("last"));
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 0af9652..62c3f89 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -26,17 +26,16 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Net; 30using System.Net;
32using System.Reflection; 31using System.Reflection;
33using System.Security.Cryptography; 32using System.Security.Cryptography;
34using OpenMetaverse;
35using OpenMetaverse.StructuredData;
36using log4net; 33using log4net;
37using Nwc.XmlRpc; 34using Nwc.XmlRpc;
38using OpenSim.Framework.Statistics; 35using OpenMetaverse;
36using OpenMetaverse.StructuredData;
39using OpenSim.Data; 37using OpenSim.Data;
38using OpenSim.Framework.Statistics;
40 39
41namespace OpenSim.Framework.Communications 40namespace OpenSim.Framework.Communications
42{ 41{
diff --git a/OpenSim/Framework/Communications/XMPP/XmppError.cs b/OpenSim/Framework/Communications/XMPP/XmppError.cs
index 1698b6a..8b7e502 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppError.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppError.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;
29using System.Xml;
30using System.Xml.Serialization; 28using System.Xml.Serialization;
31 29
32namespace OpenSim.Framework.Communications.XMPP 30namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
index 1789536..26a98ec 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppIqStanza.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;
29using System.Xml;
30using System.Xml.Serialization; 28using System.Xml.Serialization;
31 29
32namespace OpenSim.Framework.Communications.XMPP 30namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
index fd4cd5f..d150708 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.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;
29using System.Xml;
30using System.Xml.Serialization; 28using System.Xml.Serialization;
31 29
32namespace OpenSim.Framework.Communications.XMPP 30namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
index d63a0d1..95d2ca3 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.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;
29using System.Xml;
30using System.Xml.Serialization; 28using System.Xml.Serialization;
31 29
32namespace OpenSim.Framework.Communications.XMPP 30namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
index eb9dabe..888686b 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
@@ -27,12 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
32using System.Text;
33using System.Xml; 30using System.Xml;
34using System.Xml.Serialization; 31using System.Xml.Serialization;
35using log4net;
36 32
37namespace OpenSim.Framework.Communications.XMPP 33namespace OpenSim.Framework.Communications.XMPP
38{ 34{
diff --git a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
index 00df14a..db3c5eb 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppStanza.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Xml;
30using System.Xml.Serialization; 29using System.Xml.Serialization;
31 30
32namespace OpenSim.Framework.Communications.XMPP 31namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
index c5ad9b4..4937f7a 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs
@@ -28,7 +28,6 @@
28using System.IO; 28using System.IO;
29using System.Text; 29using System.Text;
30using System.Xml; 30using System.Xml;
31
32using IOStream = System.IO.Stream; 31using IOStream = System.IO.Stream;
33 32
34namespace OpenSim.Framework.Communications.XMPP 33namespace OpenSim.Framework.Communications.XMPP
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index b54aafb..1868168 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -288,7 +288,7 @@ namespace OpenSim.Framework
288 // if the first character is a "$", assume it's the name 288 // if the first character is a "$", assume it's the name
289 // of an environment variable and substitute with the value of that variable 289 // of an environment variable and substitute with the value of that variable
290 if (console_result.StartsWith("$")) 290 if (console_result.StartsWith("$"))
291 console_result = System.Environment.GetEnvironmentVariable(console_result.Substring(1)); 291 console_result = Environment.GetEnvironmentVariable(console_result.Substring(1));
292 292
293 switch (configOption.configurationType) 293 switch (configOption.configurationType)
294 { 294 {
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 721e91a..793270b 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -26,10 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text;
30using System.Reflection;
31using System.Diagnostics;
32using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics;
31using System.Reflection;
32using System.Text;
33using System.Threading;
33using log4net; 34using log4net;
34 35
35namespace OpenSim.Framework.Console 36namespace OpenSim.Framework.Console
@@ -77,8 +78,8 @@ namespace OpenSim.Framework.Console
77 /// <value> 78 /// <value>
78 /// Commands organized by keyword in a tree 79 /// Commands organized by keyword in a tree
79 /// </value> 80 /// </value>
80 private Dictionary<string, Object> tree = 81 private Dictionary<string, object> tree =
81 new Dictionary<string, Object>(); 82 new Dictionary<string, object>();
82 83
83 /// <summary> 84 /// <summary>
84 /// Get help for the given help string 85 /// Get help for the given help string
@@ -149,7 +150,7 @@ namespace OpenSim.Framework.Console
149 return help; 150 return help;
150 } 151 }
151 152
152 private List<string> CollectHelp(Dictionary<string, Object> dict) 153 private List<string> CollectHelp(Dictionary<string, object> dict)
153 { 154 {
154 List<string> result = new List<string>(); 155 List<string> result = new List<string>();
155 156
@@ -708,7 +709,7 @@ namespace OpenSim.Framework.Console
708 709
709 public void LockOutput() 710 public void LockOutput()
710 { 711 {
711 System.Threading.Monitor.Enter(cmdline); 712 Monitor.Enter(cmdline);
712 try 713 try
713 { 714 {
714 if (y != -1) 715 if (y != -1)
@@ -738,7 +739,7 @@ namespace OpenSim.Framework.Console
738 y = System.Console.CursorTop; 739 y = System.Console.CursorTop;
739 Show(); 740 Show();
740 } 741 }
741 System.Threading.Monitor.Exit(cmdline); 742 Monitor.Exit(cmdline);
742 } 743 }
743 744
744 public void Output(string text) 745 public void Output(string text)
diff --git a/OpenSim/Framework/ForeignUserProfileData.cs b/OpenSim/Framework/ForeignUserProfileData.cs
index 4f734a7..f971eb0 100644
--- a/OpenSim/Framework/ForeignUserProfileData.cs
+++ b/OpenSim/Framework/ForeignUserProfileData.cs
@@ -28,8 +28,6 @@
28 28
29using System; 29using System;
30 30
31using OpenSim.Framework;
32
33namespace OpenSim.Framework 31namespace OpenSim.Framework
34{ 32{
35 public class ForeignUserProfileData : UserProfileData 33 public class ForeignUserProfileData : UserProfileData
diff --git a/OpenSim/Framework/HGNetworkServersInfo.cs b/OpenSim/Framework/HGNetworkServersInfo.cs
index 227200e..803c712 100644
--- a/OpenSim/Framework/HGNetworkServersInfo.cs
+++ b/OpenSim/Framework/HGNetworkServersInfo.cs
@@ -26,12 +26,8 @@
26 * 26 *
27 */ 27 */
28 28
29using System;
30using System.Collections.Generic;
31using System.Net; 29using System.Net;
32 30
33using OpenSim.Framework;
34
35namespace OpenSim.Framework 31namespace OpenSim.Framework
36{ 32{
37 public class HGNetworkServersInfo 33 public class HGNetworkServersInfo
diff --git a/OpenSim/Framework/IClientFileTransfer.cs b/OpenSim/Framework/IClientFileTransfer.cs
index ac5fc2b..f947b17 100644
--- a/OpenSim/Framework/IClientFileTransfer.cs
+++ b/OpenSim/Framework/IClientFileTransfer.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,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 System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 7904e94..ae31e3c 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.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;
29using OpenSim.Framework;
30using OpenMetaverse; 28using OpenMetaverse;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
diff --git a/OpenSim/Framework/IPlugin.cs b/OpenSim/Framework/IPlugin.cs
index 1eb1c06..01ea475 100644
--- a/OpenSim/Framework/IPlugin.cs
+++ b/OpenSim/Framework/IPlugin.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework
42 /// <summary> 42 /// <summary>
43 /// This interface, describes a generic plugin 43 /// This interface, describes a generic plugin
44 /// </summary> 44 /// </summary>
45 public interface IPlugin : System.IDisposable 45 public interface IPlugin : IDisposable
46 { 46 {
47 /// <summary> 47 /// <summary>
48 /// Returns the plugin version 48 /// Returns the plugin version
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 1c0a3b5..c400309 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.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.Collections.Generic;
29using OpenMetaverse; 28using OpenMetaverse;
30using OpenSim.Framework.Console; 29using OpenSim.Framework.Console;
31 30
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
index 6f61ab5..6c9b86d 100644
--- a/OpenSim/Framework/InventoryNodeBase.cs
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -25,8 +25,8 @@
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; 28using OpenMetaverse;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 /// <summary> 32 /// <summary>
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 2ff59cd..f361cc3 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
125 } 125 }
126 } 126 }
127 127
128 public OpenMetaverse.Parcel.ParcelCategory Category { 128 public Parcel.ParcelCategory Category {
129 get { 129 get {
130 return _category; 130 return _category;
131 } 131 }
@@ -233,7 +233,7 @@ namespace OpenSim.Framework
233 } 233 }
234 } 234 }
235 235
236 public OpenMetaverse.Parcel.ParcelStatus Status { 236 public Parcel.ParcelStatus Status {
237 get { 237 get {
238 return _status; 238 return _status;
239 } 239 }
@@ -314,7 +314,7 @@ namespace OpenSim.Framework
314 } 314 }
315 } 315 }
316 316
317 public List<OpenMetaverse.ParcelManager.ParcelAccessEntry> ParcelAccessList { 317 public List<ParcelManager.ParcelAccessEntry> ParcelAccessList {
318 get { 318 get {
319 return _parcelAccessList; 319 return _parcelAccessList;
320 } 320 }
diff --git a/OpenSim/Framework/Servers/BaseHTTPHandler.cs b/OpenSim/Framework/Servers/BaseHTTPHandler.cs
index a7c3562..2aa37fb 100644
--- a/OpenSim/Framework/Servers/BaseHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/BaseHTTPHandler.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 System.Collections; 28using System.Collections;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index d69b2c0..620a7f6 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -35,12 +35,12 @@ using System.Reflection;
35using System.Text; 35using System.Text;
36using System.Threading; 36using System.Threading;
37using System.Xml; 37using System.Xml;
38using OpenMetaverse.StructuredData; 38using HttpServer;
39using log4net; 39using log4net;
40using Nwc.XmlRpc; 40using Nwc.XmlRpc;
41using OpenMetaverse.StructuredData;
41using CoolHTTPListener = HttpServer.HttpListener; 42using CoolHTTPListener = HttpServer.HttpListener;
42using IHttpClientContext = HttpServer.IHttpClientContext; 43using HttpListener=System.Net.HttpListener;
43using IHttpRequest = HttpServer.IHttpRequest;
44 44
45namespace OpenSim.Framework.Servers 45namespace OpenSim.Framework.Servers
46{ 46{
@@ -219,7 +219,7 @@ namespace OpenSim.Framework.Servers
219 public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request) 219 public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request)
220 { 220 {
221 OSHttpRequest req = new OSHttpRequest(context, request); 221 OSHttpRequest req = new OSHttpRequest(context, request);
222 OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(context, request)); 222 OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request));
223 //resp.KeepAlive = req.KeepAlive; 223 //resp.KeepAlive = req.KeepAlive;
224 //m_log.Info("[Debug BASE HTTP SERVER]: Got Request"); 224 //m_log.Info("[Debug BASE HTTP SERVER]: Got Request");
225 //HttpServerContextObj objstate= new HttpServerContextObj(req,resp); 225 //HttpServerContextObj objstate= new HttpServerContextObj(req,resp);
@@ -1373,7 +1373,7 @@ namespace OpenSim.Framework.Servers
1373 { 1373 {
1374 //m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 1374 //m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
1375 //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/"); 1375 //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/");
1376 m_httpListener2 = new HttpServer.HttpListener(IPAddress.Any, (int)m_port); 1376 m_httpListener2 = new CoolHTTPListener(IPAddress.Any, (int)m_port);
1377 m_httpListener2.ExceptionThrown += httpServerException; 1377 m_httpListener2.ExceptionThrown += httpServerException;
1378 m_httpListener2.LogWriter = httpserverlog; 1378 m_httpListener2.LogWriter = httpserverlog;
1379 1379
@@ -1408,7 +1408,7 @@ namespace OpenSim.Framework.Servers
1408 } 1408 }
1409 } 1409 }
1410 1410
1411 public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err) 1411 public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err)
1412 { 1412 {
1413 switch (err) 1413 switch (err)
1414 { 1414 {
@@ -1564,11 +1564,11 @@ namespace OpenSim.Framework.Servers
1564 /// Relays HttpServer log messages to our own logging mechanism. 1564 /// Relays HttpServer log messages to our own logging mechanism.
1565 /// </summary> 1565 /// </summary>
1566 /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information 1566 /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information
1567 public class HttpServerLogWriter : HttpServer.ILogWriter 1567 public class HttpServerLogWriter : ILogWriter
1568 { 1568 {
1569 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 1569 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
1570 1570
1571 public void Write(object source, HttpServer.LogPrio priority, string message) 1571 public void Write(object source, LogPrio priority, string message)
1572 { 1572 {
1573 /* 1573 /*
1574 switch (priority) 1574 switch (priority)
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index ff53e1a..4cbbecc 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -38,6 +38,7 @@ using log4net.Core;
38using log4net.Repository; 38using log4net.Repository;
39using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
40using OpenSim.Framework.Statistics; 40using OpenSim.Framework.Statistics;
41using Timer=System.Timers.Timer;
41 42
42namespace OpenSim.Framework.Servers 43namespace OpenSim.Framework.Servers
43{ 44{
@@ -52,7 +53,7 @@ namespace OpenSim.Framework.Servers
52 /// This will control a periodic log printout of the current 'show stats' (if they are active) for this 53 /// This will control a periodic log printout of the current 'show stats' (if they are active) for this
53 /// server. 54 /// server.
54 /// </summary> 55 /// </summary>
55 private System.Timers.Timer m_periodicDiagnosticsTimer = new System.Timers.Timer(60 * 60 * 1000); 56 private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
56 57
57 protected ConsoleBase m_console; 58 protected ConsoleBase m_console;
58 59
@@ -266,7 +267,7 @@ namespace OpenSim.Framework.Servers
266 267
267 // If there is no threshold set then the threshold is effectively everything. 268 // If there is no threshold set then the threshold is effectively everything.
268 Level thresholdLevel 269 Level thresholdLevel
269 = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All); 270 = (null != consoleAppender.Threshold ? consoleAppender.Threshold : Level.All);
270 271
271 Notice(String.Format("Console log level is {0}", thresholdLevel)); 272 Notice(String.Format("Console log level is {0}", thresholdLevel));
272 } 273 }
diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs
index 6b0614f..771def4 100644
--- a/OpenSim/Framework/Servers/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using System.Net;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
32{ 31{
diff --git a/OpenSim/Framework/Servers/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
index 26a6f10..6540798 100644
--- a/OpenSim/Framework/Servers/BinaryStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BinaryStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.IO; 28using System.IO;
29using System.Text; 29using System.Text;
30using System.Net;
31 30
32namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
33{ 32{
diff --git a/OpenSim/Framework/Servers/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/IHttpAgentHandler.cs
index ff3a5b9..e6ad57e 100644
--- a/OpenSim/Framework/Servers/IHttpAgentHandler.cs
+++ b/OpenSim/Framework/Servers/IHttpAgentHandler.cs
@@ -25,10 +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.Collections;
29using System.IO;
30using System.Net;
31
32namespace OpenSim.Framework.Servers 28namespace OpenSim.Framework.Servers
33{ 29{
34 public interface IHttpAgentHandler 30 public interface IHttpAgentHandler
diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/IStreamHandler.cs
index b3ce34d..76bf4d5 100644
--- a/OpenSim/Framework/Servers/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/IStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.Collections; 28using System.Collections;
29using System.IO; 29using System.IO;
30using System.Net;
31 30
32namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
33{ 32{
diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs
index 4c7d7ce..8e0cb38 100644
--- a/OpenSim/Framework/Servers/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequest.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Collections.Specialized; 31using System.Collections.Specialized;
32using System.Net;
33using System.IO; 32using System.IO;
33using System.Net;
34using System.Reflection; 34using System.Reflection;
35using System.Text; 35using System.Text;
36using HttpServer; 36using HttpServer;
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs
index 4947156..ff02edd 100644
--- a/OpenSim/Framework/Servers/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/OSHttpResponse.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;
29using System.Collections;
30using System.IO; 28using System.IO;
31using System.Net; 29using System.Net;
32using System.Text; 30using System.Text;
diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
index 5c2dd4a..41d86e5 100644
--- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
@@ -26,7 +26,6 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using System.Net;
30using System.Xml; 29using System.Xml;
31using System.Xml.Serialization; 30using System.Xml.Serialization;
32 31
diff --git a/OpenSim/Framework/Servers/RestHTTPHandler.cs b/OpenSim/Framework/Servers/RestHTTPHandler.cs
index 2974c56..5722885 100644
--- a/OpenSim/Framework/Servers/RestHTTPHandler.cs
+++ b/OpenSim/Framework/Servers/RestHTTPHandler.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 System.Collections; 28using System.Collections;
30 29
31namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs
index 958ee26..60da05e 100644
--- a/OpenSim/Framework/Servers/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/RestSessionService.cs
@@ -28,12 +28,10 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net; 30using System.Net;
31using System.Collections.Generic;
32using System.Reflection; 31using System.Reflection;
33using System.Text; 32using System.Text;
34using System.Xml; 33using System.Xml;
35using System.Xml.Serialization; 34using System.Xml.Serialization;
36
37using log4net; 35using log4net;
38 36
39namespace OpenSim.Framework.Servers 37namespace OpenSim.Framework.Servers
diff --git a/OpenSim/Framework/Servers/RestStreamHandler.cs b/OpenSim/Framework/Servers/RestStreamHandler.cs
index 44c9dfc..afd7fe5 100644
--- a/OpenSim/Framework/Servers/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/RestStreamHandler.cs
@@ -27,7 +27,6 @@
27 27
28using System.IO; 28using System.IO;
29using System.Text; 29using System.Text;
30using System.Net;
31 30
32namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
33{ 32{
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index fe553c9..3a297bf 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -31,23 +31,18 @@ using System.IO;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.Text; 33using System.Text;
34
35using HttpServer; 34using HttpServer;
36using HttpServer.Exceptions;
37using HttpServer.FormDecoders; 35using HttpServer.FormDecoders;
38
39using NUnit.Framework; 36using NUnit.Framework;
40using NUnit.Framework.SyntaxHelpers; 37using NUnit.Framework.SyntaxHelpers;
41 38
42using OpenSim.Framework.Servers;
43
44namespace OpenSim.Framework.Servers.Tests 39namespace OpenSim.Framework.Servers.Tests
45{ 40{
46 [TestFixture] 41 [TestFixture]
47 public class OSHttpTests 42 public class OSHttpTests
48 { 43 {
49 // we need an IHttpClientContext for our tests 44 // we need an IHttpClientContext for our tests
50 public class TestHttpClientContext: HttpServer.IHttpClientContext 45 public class TestHttpClientContext: IHttpClientContext
51 { 46 {
52 private bool _secured; 47 private bool _secured;
53 public bool Secured 48 public bool Secured
@@ -68,7 +63,7 @@ namespace OpenSim.Framework.Servers.Tests
68 public void Send(byte[] buffer, int offset, int size) {} 63 public void Send(byte[] buffer, int offset, int size) {}
69 } 64 }
70 65
71 public class TestHttpRequest: HttpServer.IHttpRequest 66 public class TestHttpRequest: IHttpRequest
72 { 67 {
73 public bool BodyIsComplete 68 public bool BodyIsComplete
74 { 69 {
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index 865dee2..8280708 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -25,6 +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 27
28using OpenMetaverse;
28using OpenMetaverse.Packets; 29using OpenMetaverse.Packets;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
@@ -73,15 +74,15 @@ namespace OpenSim.Framework
73 } 74 }
74 private uint m_objectCapacity; 75 private uint m_objectCapacity;
75 76
76 public OpenMetaverse.UUID RegionUUID 77 public UUID RegionUUID
77 { 78 {
78 get { return regionUUID;} 79 get { return regionUUID;}
79 } 80 }
80 private OpenMetaverse.UUID regionUUID; 81 private UUID regionUUID;
81 82
82 public SimStats( 83 public SimStats(
83 uint regionX, uint regionY, uint regionFlags, uint objectCapacity, 84 uint regionX, uint regionY, uint regionFlags, uint objectCapacity,
84 SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, OpenMetaverse.UUID pRUUID) 85 SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, UUID pRUUID)
85 { 86 {
86 regionUUID = pRUUID; 87 regionUUID = pRUUID;
87 m_regionX = regionX; 88 m_regionX = regionX;
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 43c73b2..ce654eb 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -29,7 +29,6 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.Packets;
33using OpenSim.Framework.Statistics.Interfaces; 32using OpenSim.Framework.Statistics.Interfaces;
34 33
35namespace OpenSim.Framework.Statistics 34namespace OpenSim.Framework.Statistics
diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index 5617e2b..b45a42f 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -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 27
28using OpenMetaverse;
29using NUnit.Framework; 28using NUnit.Framework;
30using NUnit.Framework.SyntaxHelpers;
31 29
32namespace OpenSim.Framework.Tests 30namespace OpenSim.Framework.Tests
33{ 31{
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 0224356..c5f1800 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -25,9 +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 NUnit.Framework; 28using NUnit.Framework;
30using NUnit.Framework.SyntaxHelpers; 29using NUnit.Framework.SyntaxHelpers;
30using OpenMetaverse;
31using OpenSim.Tests.Common; 31using OpenSim.Tests.Common;
32 32
33namespace OpenSim.Framework.Tests 33namespace OpenSim.Framework.Tests
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index cc048b7..901b57a 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
29 30
30namespace OpenSim.Framework 31namespace OpenSim.Framework
31{ 32{
@@ -113,7 +114,7 @@ namespace OpenSim.Framework
113 configMember.addConfigurationOption("library_location", 114 configMember.addConfigurationOption("library_location",
114 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 115 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
115 "Path to library control file", 116 "Path to library control file",
116 string.Format(".{0}inventory{0}Libraries.xml", System.IO.Path.DirectorySeparatorChar), false); 117 string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);
117 118
118 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 119 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
119 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 120 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index df7a552..9949ad8 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -194,7 +194,7 @@ namespace OpenSim.Framework
194 } 194 }
195 195
196 public static T Clamp<T>(T x, T min, T max) 196 public static T Clamp<T>(T x, T min, T max)
197 where T : System.IComparable<T> 197 where T : IComparable<T>
198 { 198 {
199 return x.CompareTo(max) > 0 ? max : 199 return x.CompareTo(max) > 0 ? max :
200 x.CompareTo(min) < 0 ? min : 200 x.CompareTo(min) < 0 ? min :
@@ -758,8 +758,8 @@ namespace OpenSim.Framework
758 memory.Read(compressed, 0, compressed.Length); 758 memory.Read(compressed, 0, compressed.Length);
759 759
760 byte[] compressedBuffer = new byte[compressed.Length + 4]; 760 byte[] compressedBuffer = new byte[compressed.Length + 4];
761 System.Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length); 761 Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length);
762 System.Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4); 762 Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4);
763 return Convert.ToBase64String(compressedBuffer); 763 return Convert.ToBase64String(compressedBuffer);
764 } 764 }
765 765
@@ -872,9 +872,9 @@ namespace OpenSim.Framework
872 { 872 {
873 string os = String.Empty; 873 string os = String.Empty;
874 874
875 if (System.Environment.OSVersion.Platform != PlatformID.Unix) 875 if (Environment.OSVersion.Platform != PlatformID.Unix)
876 { 876 {
877 os = System.Environment.OSVersion.ToString(); 877 os = Environment.OSVersion.ToString();
878 } 878 }
879 else 879 else
880 { 880 {
diff --git a/OpenSim/Framework/WearableItem.cs b/OpenSim/Framework/WearableItem.cs
index 414b135..7a4b4de 100644
--- a/OpenSim/Framework/WearableItem.cs
+++ b/OpenSim/Framework/WearableItem.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Framework
132 //int randNum = Util.RandomClass.Next(0, 1000); 132 //int randNum = Util.RandomClass.Next(0, 1000);
133 float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue; 133 float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue;
134 // float val =((float) randNum )/ ((float)(1000.0f / range)); 134 // float val =((float) randNum )/ ((float)(1000.0f / range));
135 float val = (float)OpenSim.Framework.Util.RandomClass.NextDouble() * range * 0.2f; 135 float val = (float)Util.RandomClass.NextDouble() * range * 0.2f;
136 setting.Value = setting.VisualParam.MinValue + (range / 2) + val; 136 setting.Value = setting.VisualParam.MinValue + (range / 2) + val;
137 } 137 }
138 } 138 }