diff options
author | Melanie Thielker | 2009-05-03 23:13:33 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-03 23:13:33 +0000 |
commit | 0ecd965b8c208e77a5f55bf7d1dd3cd71c2cbad7 (patch) | |
tree | 0d1b6c68eac9e0340c024f4e2828bad614634d30 | |
parent | Thank you kindly, Thomax, for a patch that: (diff) | |
download | opensim-SC-0ecd965b8c208e77a5f55bf7d1dd3cd71c2cbad7.zip opensim-SC-0ecd965b8c208e77a5f55bf7d1dd3cd71c2cbad7.tar.gz opensim-SC-0ecd965b8c208e77a5f55bf7d1dd3cd71c2cbad7.tar.bz2 opensim-SC-0ecd965b8c208e77a5f55bf7d1dd3cd71c2cbad7.tar.xz |
Some reorganization around service connectors. No functional change
-rw-r--r-- | OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectors/Interregion/LocalInterregionComms.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectors/Local/LocalInterregionComms.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectors/Remote/RESTInterregionComms.cs) | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs index f0d70a7..f0563da 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryModule.cs | |||
@@ -43,7 +43,7 @@ using OpenSim.Framework.Servers; | |||
43 | using OpenSim.Framework.Servers.Interfaces; | 43 | using OpenSim.Framework.Servers.Interfaces; |
44 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Region.Framework.Scenes; | 45 | using OpenSim.Region.Framework.Scenes; |
46 | using OpenSim.Region.CoreModules.Communications.REST; | 46 | using OpenSim.Region.CoreModules.ServiceConnectors.Interregion; |
47 | 47 | ||
48 | using OpenMetaverse.StructuredData; | 48 | using OpenMetaverse.StructuredData; |
49 | 49 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/LocalInterregionComms.cs index 1e430e5..b94efa7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Local/LocalInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/LocalInterregionComms.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Framework; | |||
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.Region.CoreModules.Communications.Local | 36 | namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion |
37 | { | 37 | { |
38 | public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn | 38 | public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn |
39 | { | 39 | { |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Remote/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs index 97ffeae..7fafb6e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Remote/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Interregion/RESTInterregionComms.cs | |||
@@ -38,12 +38,11 @@ using OpenMetaverse.StructuredData; | |||
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications; |
40 | using OpenSim.Framework.Communications.Clients; | 40 | using OpenSim.Framework.Communications.Clients; |
41 | using OpenSim.Region.CoreModules.Communications.Local; | ||
42 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
44 | using OpenSim.Region.Framework.Scenes.Hypergrid; | 43 | using OpenSim.Region.Framework.Scenes.Hypergrid; |
45 | 44 | ||
46 | namespace OpenSim.Region.CoreModules.Communications.REST | 45 | namespace OpenSim.Region.CoreModules.ServiceConnectors.Interregion |
47 | { | 46 | { |
48 | public class RESTInterregionComms : IRegionModule, IInterregionCommsOut | 47 | public class RESTInterregionComms : IRegionModule, IInterregionCommsOut |
49 | { | 48 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index c00ef3c..a26cb94 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -40,7 +40,7 @@ using OpenSim.Framework; | |||
40 | using OpenSim.Framework.Communications; | 40 | using OpenSim.Framework.Communications; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.CoreModules.Communications.REST; | 43 | using OpenSim.Region.CoreModules.ServiceConnectors.Interregion; |
44 | using OpenSim.Region.CoreModules.World.Serialiser; | 44 | using OpenSim.Region.CoreModules.World.Serialiser; |
45 | using OpenSim.Tests.Common.Mock; | 45 | using OpenSim.Tests.Common.Mock; |
46 | using OpenSim.Tests.Common.Setup; | 46 | using OpenSim.Tests.Common.Setup; |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index a0c956e..2618da6 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |||
@@ -34,7 +34,7 @@ using OpenMetaverse; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.CoreModules.Communications.REST; | 37 | using OpenSim.Region.CoreModules.ServiceConnectors.Interregion; |
38 | using OpenSim.Tests.Common; | 38 | using OpenSim.Tests.Common; |
39 | using OpenSim.Tests.Common.Mock; | 39 | using OpenSim.Tests.Common.Mock; |
40 | using OpenSim.Tests.Common.Setup; | 40 | using OpenSim.Tests.Common.Setup; |