aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2015-09-04 14:39:23 -0700
committerDiva Canto2015-09-04 14:39:23 -0700
commitd00f73c3a4cac77c97dcf4df1613fb85a516ffb4 (patch)
tree2c7a8b36b039016a56c8add3d4afe1c0e7976520
parentDeleted old unfinished code under Framework.Communications that wasn't being ... (diff)
downloadopensim-SC_OLD-d00f73c3a4cac77c97dcf4df1613fb85a516ffb4.zip
opensim-SC_OLD-d00f73c3a4cac77c97dcf4df1613fb85a516ffb4.tar.gz
opensim-SC_OLD-d00f73c3a4cac77c97dcf4df1613fb85a516ffb4.tar.bz2
opensim-SC_OLD-d00f73c3a4cac77c97dcf4df1613fb85a516ffb4.tar.xz
Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework.
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs1
-rw-r--r--OpenSim/Framework/Communications/Properties/AssemblyInfo.cs65
-rw-r--r--OpenSim/Framework/OutboundUrlFilter.cs (renamed from OpenSim/Framework/Communications/OutboundUrlFilter.cs)4
-rw-r--r--OpenSim/Framework/RestClient.cs (renamed from OpenSim/Framework/Communications/RestClient.cs)2
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs1
-rw-r--r--OpenSim/Region/Application/RegionApplicationBase.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs1
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs1
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs1
-rw-r--r--OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs1
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs1
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs1
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectSerializationTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs1
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs1
-rw-r--r--OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs1
-rw-r--r--OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Grid/GridServicesConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Land/LandServicesConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs2
-rw-r--r--OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs2
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs2
-rw-r--r--OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs2
-rw-r--r--OpenSim/Tests/Performance/NPCPerformanceTests.cs2
-rw-r--r--prebuild.xml77
76 files changed, 20 insertions, 216 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 0228c3c..808d9e4 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -42,7 +42,6 @@ using OpenMetaverse;
42using Mono.Addins; 42using Mono.Addins;
43using OpenSim; 43using OpenSim;
44using OpenSim.Framework; 44using OpenSim.Framework;
45using OpenSim.Framework.Communications;
46using OpenSim.Framework.Console; 45using OpenSim.Framework.Console;
47using OpenSim.Framework.Servers; 46using OpenSim.Framework.Servers;
48using OpenSim.Framework.Servers.HttpServer; 47using OpenSim.Framework.Servers.HttpServer;
diff --git a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs b/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
deleted file mode 100644
index b398167..0000000
--- a/OpenSim/Framework/Communications/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,65 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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.
26 */
27
28using System.Reflection;
29using System.Runtime.InteropServices;
30
31// General information about an assembly is controlled through the following
32// set of attributes. Change these attribute values to modify the information
33// associated with an assembly.
34
35[assembly : AssemblyTitle("OpenSim.Framework.Communications")]
36[assembly : AssemblyDescription("")]
37[assembly : AssemblyConfiguration("")]
38[assembly : AssemblyCompany("http://opensimulator.org")]
39[assembly : AssemblyProduct("OpenSim")]
40[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers")]
41[assembly : AssemblyTrademark("")]
42[assembly : AssemblyCulture("")]
43
44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type.
47
48[assembly : ComVisible(false)]
49
50// The following GUID is for the ID of the typelib if this project is exposed to COM
51
52[assembly : Guid("13e7c396-78a9-4a5c-baf2-6f980ea75d95")]
53
54// Version information for an assembly consists of the following four values:
55//
56// Major Version
57// Minor Version
58// Build Number
59// Revision
60//
61// You can specify all the values or you can default the Revision and Build Numbers
62// by using the '*' as shown below:
63
64[assembly : AssemblyVersion("0.8.2.*")]
65
diff --git a/OpenSim/Framework/Communications/OutboundUrlFilter.cs b/OpenSim/Framework/OutboundUrlFilter.cs
index 8b572d1..baa3647 100644
--- a/OpenSim/Framework/Communications/OutboundUrlFilter.cs
+++ b/OpenSim/Framework/OutboundUrlFilter.cs
@@ -34,7 +34,7 @@ using log4net;
34using LukeSkywalker.IPNetwork; 34using LukeSkywalker.IPNetwork;
35using Nini.Config; 35using Nini.Config;
36 36
37namespace OpenSim.Framework.Communications 37namespace OpenSim.Framework
38{ 38{
39 public class OutboundUrlFilter 39 public class OutboundUrlFilter
40 { 40 {
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Communications
62 } 62 }
63 63
64 /// <summary> 64 /// <summary>
65 /// Initializes a new instance of the <see cref="OpenSim.Framework.Communications.OutboundUrlFilter"/> class. 65 /// Initializes a new instance of the <see cref="OpenSim.Framework.OutboundUrlFilter"/> class.
66 /// </summary> 66 /// </summary>
67 /// <param name="name">Name of the filter for logging purposes.</param> 67 /// <param name="name">Name of the filter for logging purposes.</param>
68 /// <param name="config">Filter configuration</param> 68 /// <param name="config">Filter configuration</param>
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/RestClient.cs
index ff7cb4d..7080ca5 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/RestClient.cs
@@ -37,7 +37,7 @@ using log4net;
37 37
38using OpenSim.Framework.ServiceAuth; 38using OpenSim.Framework.ServiceAuth;
39 39
40namespace OpenSim.Framework.Communications 40namespace OpenSim.Framework
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// Implementation of a generic REST client 43 /// Implementation of a generic REST client
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 83c07f1..ab6f036 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -36,7 +36,6 @@ using log4net;
36using Nini.Config; 36using Nini.Config;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications;
40using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
41using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
42using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
diff --git a/OpenSim/Region/Application/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs
index b58c998..08c8579 100644
--- a/OpenSim/Region/Application/RegionApplicationBase.cs
+++ b/OpenSim/Region/Application/RegionApplicationBase.cs
@@ -32,7 +32,6 @@ using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Framework.Servers.HttpServer; 36using OpenSim.Framework.Servers.HttpServer;
38using OpenSim.Region.Framework; 37using OpenSim.Region.Framework;
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index f1b002b..3e7e4ed 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -37,7 +37,6 @@ using Nini.Config;
37using NUnit.Framework; 37using NUnit.Framework;
38using OpenMetaverse; 38using OpenMetaverse;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
42using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
43using OpenSim.Region.CoreModules.Avatar.Attachments; 42using OpenSim.Region.CoreModules.Avatar.Attachments;
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index 7d2cad6..414f06a 100644
--- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -38,7 +38,6 @@ using System.Reflection;
38using log4net; 38using log4net;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.ServiceAuth; 40using OpenSim.Framework.ServiceAuth;
41using OpenSim.Framework.Communications;
42using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
44using OpenSim.Services.Interfaces; 43using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 7ab568e..08e7dd2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -38,7 +38,6 @@ using OpenMetaverse;
38using Mono.Addins; 38using Mono.Addins;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Servers.HttpServer; 40using OpenSim.Framework.Servers.HttpServer;
41using OpenSim.Framework.Communications;
42using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
43using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
44using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 7ce2813..315d372 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -32,7 +32,6 @@ using Nini.Config;
32using Mono.Addins; 32using Mono.Addins;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Framework.Client; 36using OpenSim.Framework.Client;
38using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index c75920d..9cdb1c2 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -32,7 +32,6 @@ using Mono.Addins;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Framework.Client; 36using OpenSim.Framework.Client;
38using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 420520e..8847414 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -34,7 +34,6 @@ using NDesk.Options;
34using Nini.Config; 34using Nini.Config;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications;
38using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
39using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
index 84f9f3f..c2e645f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
@@ -36,7 +36,6 @@ using OpenSim.Data;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Serialization; 37using OpenSim.Framework.Serialization;
38using OpenSim.Framework.Serialization.External; 38using OpenSim.Framework.Serialization.External;
39using OpenSim.Framework.Communications;
40using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 39using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
41using OpenSim.Region.CoreModules.World.Serialiser; 40using OpenSim.Region.CoreModules.World.Serialiser;
42using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
index d5f3a22..57b4f80 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs
@@ -36,7 +36,6 @@ using OpenSim.Data;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Serialization; 37using OpenSim.Framework.Serialization;
38using OpenSim.Framework.Serialization.External; 38using OpenSim.Framework.Serialization.External;
39using OpenSim.Framework.Communications;
40using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 39using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
41using OpenSim.Region.CoreModules.World.Serialiser; 40using OpenSim.Region.CoreModules.World.Serialiser;
42using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
index b614c18..7265405 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
@@ -36,7 +36,6 @@ using OpenSim.Data;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Serialization; 37using OpenSim.Framework.Serialization;
38using OpenSim.Framework.Serialization.External; 38using OpenSim.Framework.Serialization.External;
39using OpenSim.Framework.Communications;
40using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 39using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
41using OpenSim.Region.CoreModules.World.Serialiser; 40using OpenSim.Region.CoreModules.World.Serialiser;
42using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index 4b015d7..519c697 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -36,7 +36,6 @@ using OpenSim.Data;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Serialization; 37using OpenSim.Framework.Serialization;
38using OpenSim.Framework.Serialization.External; 38using OpenSim.Framework.Serialization.External;
39using OpenSim.Framework.Communications;
40using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 39using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
41using OpenSim.Region.CoreModules.World.Serialiser; 40using OpenSim.Region.CoreModules.World.Serialiser;
42using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index c64ab44..1d91165 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -37,7 +37,6 @@ using OpenSim.Data;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Serialization; 38using OpenSim.Framework.Serialization;
39using OpenSim.Framework.Serialization.External; 39using OpenSim.Framework.Serialization.External;
40using OpenSim.Framework.Communications;
41using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 40using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
42using OpenSim.Region.CoreModules.Framework.InventoryAccess; 41using OpenSim.Region.CoreModules.Framework.InventoryAccess;
43using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index 69d7e16..862f0b7 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -30,7 +30,6 @@ using System.IO;
30using System.Reflection; 30using System.Reflection;
31 31
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications;
34 33
35using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 34using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
36using OpenSim.Region.Framework; 35using OpenSim.Region.Framework;
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index b1f3f9b..9dfeb96 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -40,7 +40,6 @@ using log4net;
40using Nini.Config; 40using Nini.Config;
41using OpenMetaverse; 41using OpenMetaverse;
42using OpenSim.Framework; 42using OpenSim.Framework;
43using OpenSim.Framework.Communications;
44using OpenSim.Framework.Servers; 43using OpenSim.Framework.Servers;
45using OpenSim.Framework.Servers.HttpServer; 44using OpenSim.Framework.Servers.HttpServer;
46using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 7462ebd..d45962f 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -32,7 +32,7 @@ using System.Net;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenMetaverse.Imaging; 34using OpenMetaverse.Imaging;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework;
36using OpenSim.Region.CoreModules.Scripting.DynamicTexture; 36using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index dca3dd7..f963242 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -38,7 +38,6 @@ using Nini.Config;
38using OpenMetaverse; 38using OpenMetaverse;
39using OpenMetaverse.StructuredData; 39using OpenMetaverse.StructuredData;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.Communications;
42using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 42using OpenSim.Region.Framework.Scenes;
44using OpenSim.Region.Framework.Scenes.Serialization; 43using OpenSim.Region.Framework.Scenes.Serialization;
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
index f54ab2c..4bb3799 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
@@ -34,7 +34,6 @@ using Nini.Config;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications;
38using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
40using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 600e826..d5ae83e 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -39,7 +39,6 @@ using Nini.Config;
39using OpenMetaverse; 39using OpenMetaverse;
40using Mono.Addins; 40using Mono.Addins;
41using OpenSim.Framework; 41using OpenSim.Framework;
42using OpenSim.Framework.Communications;
43using OpenSim.Region.DataSnapshot.Interfaces; 42using OpenSim.Region.DataSnapshot.Interfaces;
44using OpenSim.Region.Framework.Interfaces; 43using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Framework.Scenes; 44using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index f208afb..3b31281 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -35,7 +35,6 @@ using Nini.Config;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenMetaverse.StructuredData; 36using OpenMetaverse.StructuredData;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
40using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
41using OpenSim.Framework.Servers.HttpServer; 40using OpenSim.Framework.Servers.HttpServer;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index ef2125b..8ebcd92 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -31,7 +31,6 @@ using System.Threading;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
36 35
37namespace OpenSim.Region.Framework.Scenes 36namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 900e715..8c2f45e 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -42,7 +42,6 @@ using OpenMetaverse.Imaging;
42using OpenSim.Framework; 42using OpenSim.Framework;
43using OpenSim.Framework.Monitoring; 43using OpenSim.Framework.Monitoring;
44using OpenSim.Services.Interfaces; 44using OpenSim.Services.Interfaces;
45using OpenSim.Framework.Communications;
46using OpenSim.Framework.Console; 45using OpenSim.Framework.Console;
47using OpenSim.Region.Framework.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
48using OpenSim.Region.Framework.Scenes.Scripting; 47using OpenSim.Region.Framework.Scenes.Scripting;
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index c8c8714..b9526da 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -35,7 +35,6 @@ using OpenMetaverse.StructuredData;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Client; 37using OpenSim.Framework.Client;
38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Capabilities; 38using OpenSim.Framework.Capabilities;
40using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Services.Interfaces; 40using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index 766ce83..da18941 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -34,7 +34,6 @@ using Nini.Config;
34using NUnit.Framework; 34using NUnit.Framework;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications;
38using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
39using OpenSim.Tests.Common; 38using OpenSim.Tests.Common;
40 39
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index b6b3344..ee7c8a9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -32,7 +32,6 @@ using System.Text;
32using NUnit.Framework; 32using NUnit.Framework;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common; 36using OpenSim.Tests.Common;
38 37
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs
index 6118004..3172227 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs
@@ -32,7 +32,6 @@ using System.Threading;
32using NUnit.Framework; 32using NUnit.Framework;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
37using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
38using OpenSim.Tests.Common; 37using OpenSim.Tests.Common;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index bdf0700..098f1b4 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -33,7 +33,6 @@ using Nini.Config;
33using NUnit.Framework; 33using NUnit.Framework;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications;
37using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
38using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
39using OpenSim.Tests.Common; 38using OpenSim.Tests.Common;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
index 1d41d33..0b196c1 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
@@ -32,7 +32,6 @@ using Nini.Config;
32using NUnit.Framework; 32using NUnit.Framework;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Region.CoreModules.Framework.EntityTransfer; 35using OpenSim.Region.CoreModules.Framework.EntityTransfer;
37using OpenSim.Region.CoreModules.Framework.InventoryAccess; 36using OpenSim.Region.CoreModules.Framework.InventoryAccess;
38using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; 37using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 558ba2c..1c396ac 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -32,7 +32,6 @@ using Nini.Config;
32using NUnit.Framework; 32using NUnit.Framework;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Region.CoreModules.Framework.EntityTransfer; 35using OpenSim.Region.CoreModules.Framework.EntityTransfer;
37using OpenSim.Region.CoreModules.Framework.InventoryAccess; 36using OpenSim.Region.CoreModules.Framework.InventoryAccess;
38using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; 37using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index c2e0ae3..e6d5a2f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -31,7 +31,6 @@ using System.Reflection;
31using NUnit.Framework; 31using NUnit.Framework;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
36using OpenSim.Tests.Common; 35using OpenSim.Tests.Common;
37using log4net; 36using log4net;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
index 11e9084..975c4d9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
@@ -30,7 +30,6 @@ using System.Reflection;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications;
34using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
35using OpenSim.Tests.Common; 34using OpenSim.Tests.Common;
36 35
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
index fdbe7ae..8a2d2af 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs
@@ -31,7 +31,6 @@ using System.Reflection;
31using NUnit.Framework; 31using NUnit.Framework;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common; 36using OpenSim.Tests.Common;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSerializationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSerializationTests.cs
index 927d8e8..e3ceb04 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSerializationTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSerializationTests.cs
@@ -36,7 +36,6 @@ using NUnit.Framework;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Serialization.External; 38using OpenSim.Framework.Serialization.External;
39using OpenSim.Framework.Communications;
40using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Framework.Scenes.Serialization; 40using OpenSim.Region.Framework.Scenes.Serialization;
42using OpenSim.Services.Interfaces; 41using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
index 974529a..e00defd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
@@ -31,7 +31,6 @@ using System.Threading;
31using NUnit.Framework; 31using NUnit.Framework;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
36using OpenSim.Tests.Common; 35using OpenSim.Tests.Common;
37 36
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
index 5ba754c..1737e3c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
@@ -31,7 +31,6 @@ using System.Reflection;
31using NUnit.Framework; 31using NUnit.Framework;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
36using OpenSim.Tests.Common; 35using OpenSim.Tests.Common;
37 36
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
index cdebe25..af3ce8e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
@@ -30,7 +30,6 @@ using System.Reflection;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications;
34using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
35using OpenSim.Tests.Common; 34using OpenSim.Tests.Common;
36 35
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index fd49c88..aadf7c6 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -32,7 +32,6 @@ using Nini.Config;
32using NUnit.Framework; 32using NUnit.Framework;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Region.CoreModules.Avatar.InstantMessage; 35using OpenSim.Region.CoreModules.Avatar.InstantMessage;
37using OpenSim.Region.CoreModules.World.Permissions; 36using OpenSim.Region.CoreModules.World.Permissions;
38using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index 06e6423..96d112d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -36,7 +36,6 @@ using Nini.Config;
36using NUnit.Framework; 36using NUnit.Framework;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications;
40using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.ClientStack.Linden; 41using OpenSim.Region.ClientStack.Linden;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
index 700ca8c..42d91b9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs
@@ -35,7 +35,6 @@ using Nini.Config;
35using NUnit.Framework; 35using NUnit.Framework;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications;
39using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.CoreModules.Framework.EntityTransfer; 40using OpenSim.Region.CoreModules.Framework.EntityTransfer;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
index c6e3b8b..e5c847e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
@@ -33,7 +33,6 @@ using Nini.Config;
33using NUnit.Framework; 33using NUnit.Framework;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications;
37using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
39using OpenSim.Tests.Common; 38using OpenSim.Tests.Common;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
index cca30db..2e6dc70 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
@@ -36,7 +36,6 @@ using Nini.Config;
36using NUnit.Framework; 36using NUnit.Framework;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications;
40using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
41using OpenSim.Framework.Servers.HttpServer; 40using OpenSim.Framework.Servers.HttpServer;
42using OpenSim.Region.ClientStack.Linden; 41using OpenSim.Region.ClientStack.Linden;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index e14da8b..7127644 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
@@ -32,7 +32,6 @@ using Nini.Config;
32using NUnit.Framework; 32using NUnit.Framework;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.CoreModules.Framework; 37using OpenSim.Region.CoreModules.Framework;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index b775178..b232a44 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -32,7 +32,6 @@ using Nini.Config;
32using NUnit.Framework; 32using NUnit.Framework;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; 37using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index da93d44..bacfc17 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -35,7 +35,6 @@ using Nini.Config;
35using NUnit.Framework; 35using NUnit.Framework;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
40using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.CoreModules.Framework; 40using OpenSim.Region.CoreModules.Framework;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
index 2d36214..045fd3c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs
@@ -31,7 +31,6 @@ using System.Reflection;
31using NUnit.Framework; 31using NUnit.Framework;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
35using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
36using OpenSim.Tests.Common; 35using OpenSim.Tests.Common;
37 36
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 33ef83b..517faf1 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -36,7 +36,6 @@ using Nini.Config;
36using NUnit.Framework; 36using NUnit.Framework;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications;
40using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.CoreModules.World.Serialiser; 41using OpenSim.Region.CoreModules.World.Serialiser;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 8ec6974..b01088d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -37,7 +37,6 @@ using NUnit.Framework;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenMetaverse.Assets; 38using OpenMetaverse.Assets;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications;
41using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 42using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index edc0a52..8250e6c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -37,7 +37,6 @@ using NUnit.Framework;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenMetaverse.Assets; 38using OpenMetaverse.Assets;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications;
41using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 42using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index dff3f78..1565da9 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -35,7 +35,6 @@ using Nini.Config;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenMetaverse.StructuredData; 36using OpenMetaverse.StructuredData;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications;
39using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
41using OpenSim.Services.Interfaces; 40using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 8095b28..1cb4747 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -42,7 +42,6 @@ using OpenMetaverse;
42using OpenMetaverse.StructuredData; 42using OpenMetaverse.StructuredData;
43 43
44using OpenSim.Framework; 44using OpenSim.Framework;
45using OpenSim.Framework.Communications;
46using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Services.Interfaces; 46using OpenSim.Services.Interfaces;
48 47
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index e03e71d..9a42bac 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -37,7 +37,6 @@ using OpenMetaverse.Messages.Linden;
37using OpenMetaverse.Packets; 37using OpenMetaverse.Packets;
38using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
42using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
43using OpenSim.Region.ClientStack.Linden; 42using OpenSim.Region.ClientStack.Linden;
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index a040f43..20555e4 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -41,7 +41,6 @@ using OpenMetaverse;
41using OpenMetaverse.StructuredData; 41using OpenMetaverse.StructuredData;
42 42
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.Framework.Communications;
45using OpenSim.Region.Framework.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Services.Interfaces; 45using OpenSim.Services.Interfaces;
47 46
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
index 709d389..744d1e3 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
@@ -35,7 +35,6 @@ using OpenMetaverse;
35using Mono.Addins; 35using Mono.Addins;
36 36
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
40using OpenSim.Framework.Servers.HttpServer; 39using OpenSim.Framework.Servers.HttpServer;
41using OpenSim.Framework.Client; 40using OpenSim.Framework.Client;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index 0bebb58..77dfd40 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -33,7 +33,6 @@ using Nini.Config;
33using NUnit.Framework; 33using NUnit.Framework;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications;
37using OpenSim.Region.CoreModules.Avatar.Attachments; 36using OpenSim.Region.CoreModules.Avatar.Attachments;
38using OpenSim.Region.CoreModules.Avatar.AvatarFactory; 37using OpenSim.Region.CoreModules.Avatar.AvatarFactory;
39using OpenSim.Region.CoreModules.Framework.InventoryAccess; 38using OpenSim.Region.CoreModules.Framework.InventoryAccess;
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index badacb7..bd43552 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -33,7 +33,6 @@ using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Communications;
37using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
38using OpenMetaverse; 37using OpenMetaverse;
39 38
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
index 63730b3..d2da85f 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
@@ -32,7 +32,6 @@ using System.IO;
32using System.Reflection; 32using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
37using OpenMetaverse; 36using OpenMetaverse;
38 37
diff --git a/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs b/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
index d688299..20dc1cc 100644
--- a/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
+++ b/OpenSim/Services/Connectors/Freeswitch/RemoteFreeswitchConnector.cs
@@ -32,7 +32,7 @@ using System.Collections;
32using System.Reflection; 32using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35
36using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
37using OpenSim.Server.Base; 37using OpenSim.Server.Base;
38using OpenMetaverse; 38using OpenMetaverse;
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
index 74851a9..b7702a8 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
@@ -33,7 +33,7 @@ using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.ServiceAuth; 35using OpenSim.Framework.ServiceAuth;
36using OpenSim.Framework.Communications; 36
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
38using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; 38using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;
39using OpenSim.Server.Base; 39using OpenSim.Server.Base;
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index 9e55356..596f867 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -32,7 +32,7 @@ using System.IO;
32using System.Reflection; 32using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35
36using OpenSim.Framework.ServiceAuth; 36using OpenSim.Framework.ServiceAuth;
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
38using GridRegion = OpenSim.Services.Interfaces.GridRegion; 38using GridRegion = OpenSim.Services.Interfaces.GridRegion;
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
index ffdd94a..b5ca1ad 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
@@ -32,7 +32,7 @@ using System.IO;
32using System.Reflection; 32using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35
36using OpenSim.Framework.ServiceAuth; 36using OpenSim.Framework.ServiceAuth;
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
38using GridRegion = OpenSim.Services.Interfaces.GridRegion; 38using GridRegion = OpenSim.Services.Interfaces.GridRegion;
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index b0615b8..f235446 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -33,7 +33,7 @@ using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Communications; 36
37using OpenSim.Framework.Monitoring; 37using OpenSim.Framework.Monitoring;
38using OpenSim.Services.Interfaces; 38using OpenSim.Services.Interfaces;
39using OpenSim.Server.Base; 39using OpenSim.Server.Base;
diff --git a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
index 644331a..034c42e 100644
--- a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
@@ -33,7 +33,7 @@ using System.IO;
33using System.Reflection; 33using System.Reflection;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
38using OpenMetaverse; 38using OpenMetaverse;
39using Nwc.XmlRpc; 39using Nwc.XmlRpc;
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
index 677825e..c91ed84 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
@@ -35,7 +35,7 @@ using System.Reflection;
35using Nini.Config; 35using Nini.Config;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Framework.Communications; 38
39using OpenSim.Framework.ServiceAuth; 39using OpenSim.Framework.ServiceAuth;
40using OpenSim.Server.Base; 40using OpenSim.Server.Base;
41using OpenSim.Services.Interfaces; 41using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index eecf096..925364a 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -35,7 +35,7 @@ using System.Reflection;
35using System.Text; 35using System.Text;
36using Nini.Config; 36using Nini.Config;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38
39using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
40using OpenMetaverse; 40using OpenMetaverse;
41using OpenMetaverse.StructuredData; 41using OpenMetaverse.StructuredData;
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
index 63f3f37..b7e95c4 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
@@ -32,7 +32,7 @@ using System.IO;
32using System.Reflection; 32using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35
36using OpenSim.Framework.ServiceAuth; 36using OpenSim.Framework.ServiceAuth;
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
38using GridRegion = OpenSim.Services.Interfaces.GridRegion; 38using GridRegion = OpenSim.Services.Interfaces.GridRegion;
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
index 560e6c4..c21db54 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
@@ -32,7 +32,7 @@ using System.IO;
32using System.Reflection; 32using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35
36using OpenSim.Framework.ServiceAuth; 36using OpenSim.Framework.ServiceAuth;
37using OpenSim.Server.Base; 37using OpenSim.Server.Base;
38using OpenSim.Services.Interfaces; 38using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
index cf7583e..b215f1e 100644
--- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -37,7 +37,7 @@ using Nini.Config;
37using NUnit.Framework; 37using NUnit.Framework;
38using OpenMetaverse; 38using OpenMetaverse;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Communications; 40
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 53509dc..df8b14c 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -32,7 +32,7 @@ using Nini.Config;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Data.Null; 33using OpenSim.Data.Null;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Servers.HttpServer; 38using OpenSim.Framework.Servers.HttpServer;
diff --git a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
index 2fbebc4..c62b58e 100644
--- a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
@@ -27,7 +27,7 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework.Communications; 30
31using OpenSim.Region.Framework.Scenes; 31using OpenSim.Region.Framework.Scenes;
32using OpenSim.Services.Interfaces; 32using OpenSim.Services.Interfaces;
33 33
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 951f103..1a93c9f 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31
32using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
33using OpenSim.Region.Framework; 33using OpenSim.Region.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
index e222dc2..ca6ae42 100644
--- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs
+++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
@@ -34,7 +34,7 @@ using Nini.Config;
34using NUnit.Framework; 34using NUnit.Framework;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications; 37
38using OpenSim.Region.CoreModules.Avatar.Attachments; 38using OpenSim.Region.CoreModules.Avatar.Attachments;
39using OpenSim.Region.CoreModules.Avatar.AvatarFactory; 39using OpenSim.Region.CoreModules.Avatar.AvatarFactory;
40using OpenSim.Region.CoreModules.Framework.InventoryAccess; 40using OpenSim.Region.CoreModules.Framework.InventoryAccess;
diff --git a/prebuild.xml b/prebuild.xml
index 00fc0c7..e714abd 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -107,6 +107,7 @@
107 <Reference name="log4net" path="../../bin/"/> 107 <Reference name="log4net" path="../../bin/"/>
108 <Reference name="Mono.Addins" path="../../bin/"/> 108 <Reference name="Mono.Addins" path="../../bin/"/>
109 <Reference name="Mono.Addins.Setup" path="../../bin/"/> 109 <Reference name="Mono.Addins.Setup" path="../../bin/"/>
110 <Reference name="LukeSkywalker.IPNetwork" path="../../bin/"/>
110 <Reference name="SmartThreadPool"/> 111 <Reference name="SmartThreadPool"/>
111 <Files> 112 <Files>
112 <Match pattern="*.cs" recurse="false"/> 113 <Match pattern="*.cs" recurse="false"/>
@@ -445,48 +446,6 @@
445 </Project> 446 </Project>
446 447
447 448
448 <Project frameworkVersion="v4_0" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
449 <Configuration name="Debug">
450 <Options>
451 <OutputPath>../../../bin/</OutputPath>
452 </Options>
453 </Configuration>
454 <Configuration name="Release">
455 <Options>
456 <OutputPath>../../../bin/</OutputPath>
457 </Options>
458 </Configuration>
459
460 <ReferencePath>../../../bin/</ReferencePath>
461 <Reference name="System"/>
462 <Reference name="System.Core"/>
463 <Reference name="System.Xml"/>
464 <Reference name="System.Web"/>
465 <Reference name="OpenSim.Data"/>
466 <Reference name="OpenSim.Framework"/>
467 <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/>
468 <Reference name="OpenSim.Framework.Console"/>
469 <Reference name="OpenSim.Framework.Monitoring"/>
470 <Reference name="OpenSim.Framework.Servers"/>
471 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
472 <Reference name="OpenSim.Services.Interfaces"/>
473 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
474 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
475 <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code -->
476 <Reference name="OpenMetaverse" path="../../../bin/"/>
477 <Reference name="LukeSkywalker.IPNetwork" path="../../../bin/"/>
478 <Reference name="Nini" path="../../../bin/"/>
479 <Reference name="XMLRPC" path="../../../bin/"/>
480 <Reference name="log4net" path="../../../bin/"/>
481
482 <Files>
483 <Match pattern="*.cs" recurse="true">
484 <Exclude name="Tests" pattern="Tests"/>
485 </Match>
486 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
487 </Files>
488 </Project>
489
490 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library"> 449 <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.SharedBase" path="OpenSim/Region/PhysicsModules/SharedBase" type="Library">
491 <Configuration name="Debug"> 450 <Configuration name="Debug">
492 <Options> 451 <Options>
@@ -538,7 +497,6 @@
538 <Reference name="OpenSim.Services.Interfaces"/> 497 <Reference name="OpenSim.Services.Interfaces"/>
539 <Reference name="OpenSim.Framework"/> 498 <Reference name="OpenSim.Framework"/>
540 <Reference name="OpenSim.Capabilities"/> 499 <Reference name="OpenSim.Capabilities"/>
541 <Reference name="OpenSim.Framework.Communications"/>
542 <Reference name="OpenSim.Data"/> 500 <Reference name="OpenSim.Data"/>
543 <Reference name="OpenSim.Framework.Console"/> 501 <Reference name="OpenSim.Framework.Console"/>
544 <Reference name="OpenSim.Framework.Monitoring"/> 502 <Reference name="OpenSim.Framework.Monitoring"/>
@@ -549,7 +507,6 @@
549 507
550 <!-- For scripting in funny languages by default --> 508 <!-- For scripting in funny languages by default -->
551 <Reference name="XMLRPC" path="../../../bin/"/> 509 <Reference name="XMLRPC" path="../../../bin/"/>
552 <Reference name="OpenSim.Framework.Communications"/>
553 <Reference name="Nini" path="../../../bin/"/> 510 <Reference name="Nini" path="../../../bin/"/>
554 <Reference name="log4net" path="../../../bin/"/> 511 <Reference name="log4net" path="../../../bin/"/>
555 <Reference name="DotNetOpenMail" path="../../../bin/"/> 512 <Reference name="DotNetOpenMail" path="../../../bin/"/>
@@ -562,8 +519,6 @@
562 </Files> 519 </Files>
563 </Project> 520 </Project>
564 521
565 <!-- OpenSim.Framework.Communications -->
566
567 <!-- OGS projects --> 522 <!-- OGS projects -->
568 523
569 524
@@ -716,7 +671,6 @@
716 <Reference name="OpenSim.Data"/> 671 <Reference name="OpenSim.Data"/>
717 <Reference name="OpenSim.Framework"/> 672 <Reference name="OpenSim.Framework"/>
718 <Reference name="OpenSim.Capabilities"/> 673 <Reference name="OpenSim.Capabilities"/>
719 <Reference name="OpenSim.Framework.Communications"/>
720 <Reference name="OpenSim.Framework.Console"/> 674 <Reference name="OpenSim.Framework.Console"/>
721 <Reference name="OpenSim.Framework.Monitoring"/> 675 <Reference name="OpenSim.Framework.Monitoring"/>
722 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 676 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
@@ -1404,7 +1358,6 @@
1404 <Reference name="OpenSim.Framework.Servers"/> 1358 <Reference name="OpenSim.Framework.Servers"/>
1405 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1359 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1406 <Reference name="OpenSim.Framework.Console"/> 1360 <Reference name="OpenSim.Framework.Console"/>
1407 <Reference name="OpenSim.Framework.Communications"/>
1408 <Reference name="OpenSim.Region.Framework"/> 1361 <Reference name="OpenSim.Region.Framework"/>
1409 <Reference name="OpenSim.Services.Interfaces"/> 1362 <Reference name="OpenSim.Services.Interfaces"/>
1410 <Reference name="Nini" path="../../../../../bin/"/> 1363 <Reference name="Nini" path="../../../../../bin/"/>
@@ -1497,7 +1450,6 @@
1497 <Reference name="OpenSim.Capabilities"/> 1450 <Reference name="OpenSim.Capabilities"/>
1498 <Reference name="OpenSim.Data"/> 1451 <Reference name="OpenSim.Data"/>
1499 <Reference name="OpenSim.Framework"/> 1452 <Reference name="OpenSim.Framework"/>
1500 <Reference name="OpenSim.Framework.Communications"/>
1501 <Reference name="OpenSim.Framework.Console"/> 1453 <Reference name="OpenSim.Framework.Console"/>
1502 <Reference name="OpenSim.Framework.Monitoring"/> 1454 <Reference name="OpenSim.Framework.Monitoring"/>
1503 <Reference name="OpenSim.Framework.Serialization"/> 1455 <Reference name="OpenSim.Framework.Serialization"/>
@@ -1517,7 +1469,6 @@
1517 1469
1518 <!-- For scripting in funny languages by default --> 1470 <!-- For scripting in funny languages by default -->
1519 <Reference name="XMLRPC" path="../../../bin/"/> 1471 <Reference name="XMLRPC" path="../../../bin/"/>
1520 <Reference name="OpenSim.Framework.Communications"/>
1521 <Reference name="Nini" path="../../../bin/"/> 1472 <Reference name="Nini" path="../../../bin/"/>
1522 <Reference name="log4net" path="../../../bin/"/> 1473 <Reference name="log4net" path="../../../bin/"/>
1523 <Reference name="DotNetOpenMail" path="../../../bin/"/> 1474 <Reference name="DotNetOpenMail" path="../../../bin/"/>
@@ -1552,13 +1503,11 @@
1552 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 1503 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1553 <Reference name="OpenMetaverse" path="../../../bin/"/> 1504 <Reference name="OpenMetaverse" path="../../../bin/"/>
1554 <Reference name="OpenSim.Framework"/> 1505 <Reference name="OpenSim.Framework"/>
1555 <Reference name="OpenSim.Framework.Communications"/>
1556 <Reference name="OpenSim.Region.Framework"/> 1506 <Reference name="OpenSim.Region.Framework"/>
1557 <Reference name="OpenSim.Server.Base"/> 1507 <Reference name="OpenSim.Server.Base"/>
1558 <Reference name="OpenSim.Server.Handlers"/> 1508 <Reference name="OpenSim.Server.Handlers"/>
1559 <Reference name="OpenSim.Framework.Console"/> 1509 <Reference name="OpenSim.Framework.Console"/>
1560 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> 1510 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
1561 <Reference name="OpenSim.Framework.Communications"/>
1562 <Reference name="OpenSim.Region.CoreModules"/> 1511 <Reference name="OpenSim.Region.CoreModules"/>
1563 <Reference name="Nini" path="../../../bin/"/> 1512 <Reference name="Nini" path="../../../bin/"/>
1564 <Reference name="log4net" path="../../../bin/"/> 1513 <Reference name="log4net" path="../../../bin/"/>
@@ -1597,7 +1546,6 @@
1597 <Reference name="OpenMetaverse" path="../../../bin/"/> 1546 <Reference name="OpenMetaverse" path="../../../bin/"/>
1598 <Reference name="OpenSim.Capabilities"/> 1547 <Reference name="OpenSim.Capabilities"/>
1599 <Reference name="OpenSim.Framework"/> 1548 <Reference name="OpenSim.Framework"/>
1600 <Reference name="OpenSim.Framework.Communications"/>
1601 <Reference name="OpenSim.Data"/> 1549 <Reference name="OpenSim.Data"/>
1602 <Reference name="OpenSim.Framework.Console"/> 1550 <Reference name="OpenSim.Framework.Console"/>
1603 <Reference name="OpenSim.Framework.Monitoring"/> 1551 <Reference name="OpenSim.Framework.Monitoring"/>
@@ -1616,7 +1564,6 @@
1616 1564
1617 <!-- For scripting in funny languages by default --> 1565 <!-- For scripting in funny languages by default -->
1618 <Reference name="XMLRPC" path="../../../bin/"/> 1566 <Reference name="XMLRPC" path="../../../bin/"/>
1619 <Reference name="OpenSim.Framework.Communications"/>
1620 <Reference name="Nini" path="../../../bin/"/> 1567 <Reference name="Nini" path="../../../bin/"/>
1621 <Reference name="log4net" path="../../../bin/"/> 1568 <Reference name="log4net" path="../../../bin/"/>
1622 <Reference name="DotNetOpenMail" path="../../../bin/"/> 1569 <Reference name="DotNetOpenMail" path="../../../bin/"/>
@@ -1860,7 +1807,6 @@
1860 <Reference name="OpenMetaverse" path="../../../bin/"/> 1807 <Reference name="OpenMetaverse" path="../../../bin/"/>
1861 <Reference name="OpenSim.Framework"/> 1808 <Reference name="OpenSim.Framework"/>
1862 <Reference name="OpenSim.Data"/> 1809 <Reference name="OpenSim.Data"/>
1863 <Reference name="OpenSim.Framework.Communications"/>
1864 <Reference name="OpenSim.Framework.Console"/> 1810 <Reference name="OpenSim.Framework.Console"/>
1865 <Reference name="OpenSim.Framework.Monitoring"/> 1811 <Reference name="OpenSim.Framework.Monitoring"/>
1866 <Reference name="OpenSim.Framework.Servers"/> 1812 <Reference name="OpenSim.Framework.Servers"/>
@@ -1970,7 +1916,6 @@
1970 <Reference name="OpenSim"/> 1916 <Reference name="OpenSim"/>
1971 <Reference name="OpenSim.Region.Framework"/> 1917 <Reference name="OpenSim.Region.Framework"/>
1972 <Reference name="OpenSim.Region.CoreModules"/> 1918 <Reference name="OpenSim.Region.CoreModules"/>
1973 <Reference name="OpenSim.Framework.Communications"/>
1974 <Reference name="OpenSim.Framework"/> 1919 <Reference name="OpenSim.Framework"/>
1975 <Reference name="OpenSim.Framework.Servers"/> 1920 <Reference name="OpenSim.Framework.Servers"/>
1976 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1921 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
@@ -2005,7 +1950,6 @@
2005 <Reference name="System.Data"/> 1950 <Reference name="System.Data"/>
2006 <Reference name="OpenSim.Capabilities"/> 1951 <Reference name="OpenSim.Capabilities"/>
2007 <Reference name="OpenSim.Framework"/> 1952 <Reference name="OpenSim.Framework"/>
2008 <Reference name="OpenSim.Framework.Communications"/>
2009 <Reference name="OpenSim.Framework.Console"/> 1953 <Reference name="OpenSim.Framework.Console"/>
2010 <Reference name="OpenSim.Framework.Servers"/> 1954 <Reference name="OpenSim.Framework.Servers"/>
2011 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1955 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
@@ -2158,7 +2102,6 @@
2158 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> 2102 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
2159 <Reference name="OpenSim"/> 2103 <Reference name="OpenSim"/>
2160 <Reference name="OpenSim.Framework"/> 2104 <Reference name="OpenSim.Framework"/>
2161 <Reference name="OpenSim.Framework.Communications"/>
2162 <Reference name="OpenSim.Region.Framework"/> 2105 <Reference name="OpenSim.Region.Framework"/>
2163 <Reference name="OpenSim.Region.CoreModules"/> 2106 <Reference name="OpenSim.Region.CoreModules"/>
2164 <Reference name="OpenSim.Framework.Console"/> 2107 <Reference name="OpenSim.Framework.Console"/>
@@ -2195,7 +2138,6 @@
2195 <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> 2138 <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/>
2196 <Reference name="OpenSim"/> 2139 <Reference name="OpenSim"/>
2197 <Reference name="OpenSim.Framework"/> 2140 <Reference name="OpenSim.Framework"/>
2198 <Reference name="OpenSim.Framework.Communications"/>
2199 <Reference name="OpenSim.Region.Framework"/> 2141 <Reference name="OpenSim.Region.Framework"/>
2200 <Reference name="OpenSim.Region.CoreModules"/> 2142 <Reference name="OpenSim.Region.CoreModules"/>
2201 <Reference name="OpenSim.Framework.Console"/> 2143 <Reference name="OpenSim.Framework.Console"/>
@@ -2232,7 +2174,6 @@
2232 <Reference name="OpenMetaverse.StructuredData" path="../../../../../../bin/"/> 2174 <Reference name="OpenMetaverse.StructuredData" path="../../../../../../bin/"/>
2233 <Reference name="OpenSim"/> 2175 <Reference name="OpenSim"/>
2234 <Reference name="OpenSim.Framework"/> 2176 <Reference name="OpenSim.Framework"/>
2235 <Reference name="OpenSim.Framework.Communications"/>
2236 <Reference name="OpenSim.Framework.Console"/> 2177 <Reference name="OpenSim.Framework.Console"/>
2237 <Reference name="OpenSim.Framework.Monitoring"/> 2178 <Reference name="OpenSim.Framework.Monitoring"/>
2238 <Reference name="OpenSim.Region.Framework"/> 2179 <Reference name="OpenSim.Region.Framework"/>
@@ -2300,7 +2241,6 @@
2300 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> 2241 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
2301 <Reference name="OpenSim"/> 2242 <Reference name="OpenSim"/>
2302 <Reference name="OpenSim.Framework"/> 2243 <Reference name="OpenSim.Framework"/>
2303 <Reference name="OpenSim.Framework.Communications"/>
2304 <Reference name="OpenSim.Region.Framework"/> 2244 <Reference name="OpenSim.Region.Framework"/>
2305 <Reference name="OpenSim.Region.CoreModules"/> 2245 <Reference name="OpenSim.Region.CoreModules"/>
2306 <Reference name="OpenSim.Framework.Console"/> 2246 <Reference name="OpenSim.Framework.Console"/>
@@ -2340,7 +2280,6 @@
2340 <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> 2280 <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/>
2341 <Reference name="OpenSim"/> 2281 <Reference name="OpenSim"/>
2342 <Reference name="OpenSim.Framework"/> 2282 <Reference name="OpenSim.Framework"/>
2343 <Reference name="OpenSim.Framework.Communications"/>
2344 <Reference name="OpenSim.Region.Framework"/> 2283 <Reference name="OpenSim.Region.Framework"/>
2345 <Reference name="OpenSim.Region.CoreModules"/> 2284 <Reference name="OpenSim.Region.CoreModules"/>
2346 <Reference name="OpenSim.Framework.Console"/> 2285 <Reference name="OpenSim.Framework.Console"/>
@@ -2376,7 +2315,6 @@
2376 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> 2315 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
2377 <Reference name="OpenSim"/> 2316 <Reference name="OpenSim"/>
2378 <Reference name="OpenSim.Framework"/> 2317 <Reference name="OpenSim.Framework"/>
2379 <Reference name="OpenSim.Framework.Communications"/>
2380 <Reference name="OpenSim.Region.Framework"/> 2318 <Reference name="OpenSim.Region.Framework"/>
2381 <Reference name="OpenSim.Region.CoreModules"/> 2319 <Reference name="OpenSim.Region.CoreModules"/>
2382 <Reference name="OpenSim.Framework.Console"/> 2320 <Reference name="OpenSim.Framework.Console"/>
@@ -2437,7 +2375,6 @@
2437 2375
2438 <!-- For scripting in funny languages by default --> 2376 <!-- For scripting in funny languages by default -->
2439 <Reference name="XMLRPC" path="../../../bin/"/> 2377 <Reference name="XMLRPC" path="../../../bin/"/>
2440 <Reference name="OpenSim.Framework.Communications"/>
2441 <Reference name="Nini" path="../../../bin/"/> 2378 <Reference name="Nini" path="../../../bin/"/>
2442 <Reference name="log4net" path="../../../bin/"/> 2379 <Reference name="log4net" path="../../../bin/"/>
2443 <Reference name="DotNetOpenMail" path="../../../bin/"/> 2380 <Reference name="DotNetOpenMail" path="../../../bin/"/>
@@ -2687,7 +2624,6 @@
2687 <Reference name="OpenSim.Data"/> 2624 <Reference name="OpenSim.Data"/>
2688 <Reference name="OpenSim.Data.Null"/> 2625 <Reference name="OpenSim.Data.Null"/>
2689 <Reference name="OpenSim.Framework"/> 2626 <Reference name="OpenSim.Framework"/>
2690 <Reference name="OpenSim.Framework.Communications"/>
2691 <Reference name="OpenSim.Framework.Console"/> 2627 <Reference name="OpenSim.Framework.Console"/>
2692 <Reference name="OpenSim.Framework.Servers"/> 2628 <Reference name="OpenSim.Framework.Servers"/>
2693 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2629 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
@@ -3016,7 +2952,6 @@
3016 <Reference name="OpenSim.Data.Null"/> 2952 <Reference name="OpenSim.Data.Null"/>
3017 <Reference name="OpenSim.Framework"/> 2953 <Reference name="OpenSim.Framework"/>
3018 <Reference name="OpenSim.Framework.Serialization"/> 2954 <Reference name="OpenSim.Framework.Serialization"/>
3019 <Reference name="OpenSim.Framework.Communications"/>
3020 <Reference name="OpenSim.Framework.Console"/> 2955 <Reference name="OpenSim.Framework.Console"/>
3021 <Reference name="OpenSim.Framework.Monitoring"/> 2956 <Reference name="OpenSim.Framework.Monitoring"/>
3022 <Reference name="OpenSim.Framework.Servers"/> 2957 <Reference name="OpenSim.Framework.Servers"/>
@@ -3036,7 +2971,6 @@
3036 2971
3037 <!-- For scripting in funny languages by default --> 2972 <!-- For scripting in funny languages by default -->
3038 <Reference name="XMLRPC" path="../../../bin/"/> 2973 <Reference name="XMLRPC" path="../../../bin/"/>
3039 <Reference name="OpenSim.Framework.Communications"/>
3040 <Reference name="Nini" path="../../../bin/"/> 2974 <Reference name="Nini" path="../../../bin/"/>
3041 <Reference name="log4net" path="../../../bin/"/> 2975 <Reference name="log4net" path="../../../bin/"/>
3042 <Reference name="DotNetOpenMail" path="../../../bin/"/> 2976 <Reference name="DotNetOpenMail" path="../../../bin/"/>
@@ -3095,7 +3029,6 @@
3095 <Reference name="OpenSim.Data"/> 3029 <Reference name="OpenSim.Data"/>
3096 <Reference name="OpenSim.Framework"/> 3030 <Reference name="OpenSim.Framework"/>
3097 <Reference name="OpenSim.Framework.Serialization"/> 3031 <Reference name="OpenSim.Framework.Serialization"/>
3098 <Reference name="OpenSim.Framework.Communications"/>
3099 <Reference name="OpenSim.Framework.Console"/> 3032 <Reference name="OpenSim.Framework.Console"/>
3100 <Reference name="OpenSim.Framework.Monitoring"/> 3033 <Reference name="OpenSim.Framework.Monitoring"/>
3101 <Reference name="OpenSim.Framework.Servers"/> 3034 <Reference name="OpenSim.Framework.Servers"/>
@@ -3116,7 +3049,6 @@
3116 3049
3117 <!-- For scripting in funny languages by default --> 3050 <!-- For scripting in funny languages by default -->
3118 <Reference name="XMLRPC" path="../../../bin/"/> 3051 <Reference name="XMLRPC" path="../../../bin/"/>
3119 <Reference name="OpenSim.Framework.Communications"/>
3120 <Reference name="Nini" path="../../../bin/"/> 3052 <Reference name="Nini" path="../../../bin/"/>
3121 <Reference name="log4net" path="../../../bin/"/> 3053 <Reference name="log4net" path="../../../bin/"/>
3122 <Reference name="DotNetOpenMail" path="../../../bin/"/> 3054 <Reference name="DotNetOpenMail" path="../../../bin/"/>
@@ -3161,7 +3093,6 @@
3161 <Reference name="OpenSim.Capabilities"/> 3093 <Reference name="OpenSim.Capabilities"/>
3162 <Reference name="OpenSim.Data"/> 3094 <Reference name="OpenSim.Data"/>
3163 <Reference name="OpenSim.Framework"/> 3095 <Reference name="OpenSim.Framework"/>
3164 <Reference name="OpenSim.Framework.Communications"/>
3165 <Reference name="OpenSim.Framework.Console"/> 3096 <Reference name="OpenSim.Framework.Console"/>
3166 <Reference name="OpenSim.Framework.Monitoring"/> 3097 <Reference name="OpenSim.Framework.Monitoring"/>
3167 <Reference name="OpenSim.Framework.Servers"/> 3098 <Reference name="OpenSim.Framework.Servers"/>
@@ -3182,7 +3113,6 @@
3182 3113
3183 <!-- For scripting in funny languages by default --> 3114 <!-- For scripting in funny languages by default -->
3184 <Reference name="XMLRPC" path="../../../bin/"/> 3115 <Reference name="XMLRPC" path="../../../bin/"/>
3185 <Reference name="OpenSim.Framework.Communications"/>
3186 <Reference name="Nini" path="../../../bin/"/> 3116 <Reference name="Nini" path="../../../bin/"/>
3187 <Reference name="log4net" path="../../../bin/"/> 3117 <Reference name="log4net" path="../../../bin/"/>
3188 <Reference name="DotNetOpenMail" path="../../../bin/"/> 3118 <Reference name="DotNetOpenMail" path="../../../bin/"/>
@@ -3223,7 +3153,6 @@
3223 <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/> 3153 <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/>
3224 <Reference name="OpenSim.Capabilities"/> 3154 <Reference name="OpenSim.Capabilities"/>
3225 <Reference name="OpenSim.Framework"/> 3155 <Reference name="OpenSim.Framework"/>
3226 <Reference name="OpenSim.Framework.Communications"/>
3227 <Reference name="OpenSim.Framework.Monitoring"/> 3156 <Reference name="OpenSim.Framework.Monitoring"/>
3228 <Reference name="OpenSim.Framework.Servers"/> 3157 <Reference name="OpenSim.Framework.Servers"/>
3229 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3158 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
@@ -3262,7 +3191,6 @@
3262 <Reference name="OpenMetaverse" path="../../../../../../bin/"/> 3191 <Reference name="OpenMetaverse" path="../../../../../../bin/"/>
3263 <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> 3192 <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/>
3264 <Reference name="OpenSim.Framework"/> 3193 <Reference name="OpenSim.Framework"/>
3265 <Reference name="OpenSim.Framework.Communications"/>
3266 <Reference name="OpenSim.Framework.Monitoring"/> 3194 <Reference name="OpenSim.Framework.Monitoring"/>
3267 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> 3195 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
3268 <Reference name="OpenSim.Region.CoreModules"/> 3196 <Reference name="OpenSim.Region.CoreModules"/>
@@ -3293,7 +3221,6 @@
3293 <Reference name="System.Core"/> 3221 <Reference name="System.Core"/>
3294 <Reference name="System.Xml"/> 3222 <Reference name="System.Xml"/>
3295 <Reference name="OpenSim.Framework"/> 3223 <Reference name="OpenSim.Framework"/>
3296 <Reference name="OpenSim.Framework.Communications"/>
3297 <Reference name="OpenSim.Framework.Servers"/> 3224 <Reference name="OpenSim.Framework.Servers"/>
3298 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3225 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3299 <Reference name="OpenSim.Region.CoreModules"/> 3226 <Reference name="OpenSim.Region.CoreModules"/>
@@ -3472,7 +3399,6 @@
3472 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 3399 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
3473 <Reference name="XMLRPC" path="../../../bin/"/> 3400 <Reference name="XMLRPC" path="../../../bin/"/>
3474 <Reference name="OpenSim.Framework"/> 3401 <Reference name="OpenSim.Framework"/>
3475 <Reference name="OpenSim.Framework.Communications"/>
3476 <Reference name="OpenSim.Framework.Console"/> 3402 <Reference name="OpenSim.Framework.Console"/>
3477 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3403 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3478 <Reference name="OpenSim.Region.CoreModules"/> 3404 <Reference name="OpenSim.Region.CoreModules"/>
@@ -3512,7 +3438,6 @@
3512 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 3438 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
3513 <Reference name="XMLRPC" path="../../../bin/"/> 3439 <Reference name="XMLRPC" path="../../../bin/"/>
3514 <Reference name="OpenSim.Framework"/> 3440 <Reference name="OpenSim.Framework"/>
3515 <Reference name="OpenSim.Framework.Communications"/>
3516 <Reference name="OpenSim.Framework.Console"/> 3441 <Reference name="OpenSim.Framework.Console"/>
3517 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3442 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3518 <Reference name="OpenSim.Region.CoreModules"/> 3443 <Reference name="OpenSim.Region.CoreModules"/>