From 0ecd965b8c208e77a5f55bf7d1dd3cd71c2cbad7 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Sun, 3 May 2009 23:13:33 +0000
Subject: [PATCH] Some reorganization around service connectors. No functional
 change

---
 .../CoreModules/Hypergrid/HGStandaloneInventoryModule.cs       | 2 +-
 .../{Local => Interregion}/LocalInterregionComms.cs            | 2 +-
 .../{Remote => Interregion}/RESTInterregionComms.cs            | 3 +--
 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs    | 2 +-
 .../Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs   | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename OpenSim/Region/CoreModules/ServiceConnectors/{Local => Interregion}/LocalInterregionComms.cs (99%)
 rename OpenSim/Region/CoreModules/ServiceConnectors/{Remote => Interregion}/RESTInterregionComms.cs (99%)

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs
index f0d70a79a1..f0563da02a 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs
@@ -43,7 +43,7 @@ using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.Communications.REST;
+using OpenSim.Region.CoreModules.ServiceConnectors.Interregion;
 
 using OpenMetaverse.StructuredData;
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/LocalInterregionComms.cs
similarity index 99%
rename from OpenSim/Region/CoreModules/ServiceConnectors/Local/LocalInterregionComms.cs
rename to OpenSim/Region/CoreModules/ServiceConnectors/Interregion/LocalInterregionComms.cs
index 1e430e5e6f..b94efa7b17 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/LocalInterregionComms.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.CoreModules.Communications.Local
+namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion
 {
     public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn
     {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Remote/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs
similarity index 99%
rename from OpenSim/Region/CoreModules/ServiceConnectors/Remote/RESTInterregionComms.cs
rename to OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs
index 97ffeae192..7fafb6e0f9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Remote/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs
@@ -38,12 +38,11 @@ using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Clients;
-using OpenSim.Region.CoreModules.Communications.Local;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Hypergrid;
 
-namespace OpenSim.Region.CoreModules.Communications.REST
+namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion
 {
     public class RESTInterregionComms : IRegionModule, IInterregionCommsOut
     {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index c00ef3ce2d..a26cb94b5f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.Communications.REST;
+using OpenSim.Region.CoreModules.ServiceConnectors.Interregion;
 using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index a0c956e167..2618da6526 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -34,7 +34,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.Communications.REST;
+using OpenSim.Region.CoreModules.ServiceConnectors.Interregion;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;