diff options
author | Diva Canto | 2010-01-11 07:45:47 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-11 07:45:47 -0800 |
commit | 001d3695683d9511446d194feeb763c437170028 (patch) | |
tree | 037954a2227cfd5551ddbd9e1d3b1271284c151f /OpenSim/Region/Framework/Scenes | |
parent | Remove CreateCommsManagerPlugin (diff) | |
download | opensim-SC_OLD-001d3695683d9511446d194feeb763c437170028.zip opensim-SC_OLD-001d3695683d9511446d194feeb763c437170028.tar.gz opensim-SC_OLD-001d3695683d9511446d194feeb763c437170028.tar.bz2 opensim-SC_OLD-001d3695683d9511446d194feeb763c437170028.tar.xz |
CommunicationsManager deleted.
Diffstat (limited to '')
7 files changed, 11 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs index 76d7a09..8e08912 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs | |||
@@ -64,11 +64,11 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
64 | #region Constructors | 64 | #region Constructors |
65 | 65 | ||
66 | public HGScene(RegionInfo regInfo, AgentCircuitManager authen, | 66 | public HGScene(RegionInfo regInfo, AgentCircuitManager authen, |
67 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 67 | SceneCommunicationService sceneGridService, |
68 | StorageManager storeManager, | 68 | StorageManager storeManager, |
69 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 69 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
70 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 70 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
71 | : base(regInfo, authen, commsMan, sceneGridService, storeManager, moduleLoader, | 71 | : base(regInfo, authen, sceneGridService, storeManager, moduleLoader, |
72 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) | 72 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) |
73 | { | 73 | { |
74 | m_log.Info("[HGScene]: Starting HGScene."); | 74 | m_log.Info("[HGScene]: Starting HGScene."); |
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs index 61419e6..a7a7c27 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
61 | public HGSceneCommunicationService(CommunicationsManager commsMan) : base(commsMan) | 61 | public HGSceneCommunicationService() : base() |
62 | { | 62 | { |
63 | } | 63 | } |
64 | 64 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0493b4c..618e153 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -140,7 +140,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
140 | protected ModuleLoader m_moduleLoader; | 140 | protected ModuleLoader m_moduleLoader; |
141 | protected StorageManager m_storageManager; | 141 | protected StorageManager m_storageManager; |
142 | protected AgentCircuitManager m_authenticateHandler; | 142 | protected AgentCircuitManager m_authenticateHandler; |
143 | public CommunicationsManager CommsManager; | ||
144 | 143 | ||
145 | protected SceneCommunicationService m_sceneGridService; | 144 | protected SceneCommunicationService m_sceneGridService; |
146 | public bool loginsdisabled = true; | 145 | public bool loginsdisabled = true; |
@@ -547,7 +546,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
547 | #region Constructors | 546 | #region Constructors |
548 | 547 | ||
549 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, | 548 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, |
550 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 549 | SceneCommunicationService sceneGridService, |
551 | StorageManager storeManager, | 550 | StorageManager storeManager, |
552 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 551 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
553 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 552 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
@@ -583,7 +582,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
583 | m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue/2))+(uint)(uint.MaxValue/4); | 582 | m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue/2))+(uint)(uint.MaxValue/4); |
584 | m_moduleLoader = moduleLoader; | 583 | m_moduleLoader = moduleLoader; |
585 | m_authenticateHandler = authen; | 584 | m_authenticateHandler = authen; |
586 | CommsManager = commsMan; | ||
587 | m_sceneGridService = sceneGridService; | 585 | m_sceneGridService = sceneGridService; |
588 | m_storageManager = storeManager; | 586 | m_storageManager = storeManager; |
589 | m_regInfo = regInfo; | 587 | m_regInfo = regInfo; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 2e82748..269bd4a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -56,7 +56,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
56 | { | 56 | { |
57 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 57 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
58 | 58 | ||
59 | protected CommunicationsManager m_commsProvider; | ||
60 | protected RegionInfo m_regionInfo; | 59 | protected RegionInfo m_regionInfo; |
61 | protected Scene m_scene; | 60 | protected Scene m_scene; |
62 | 61 | ||
@@ -124,9 +123,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
124 | 123 | ||
125 | public KiPrimitiveDelegate KiPrimitive; | 124 | public KiPrimitiveDelegate KiPrimitive; |
126 | 125 | ||
127 | public SceneCommunicationService(CommunicationsManager commsMan) | 126 | public SceneCommunicationService() |
128 | { | 127 | { |
129 | m_commsProvider = commsMan; | ||
130 | m_agentsInTransit = new List<UUID>(); | 128 | m_agentsInTransit = new List<UUID>(); |
131 | } | 129 | } |
132 | 130 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 2365e16..501207e 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -58,7 +58,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
58 | public UUID agent1, agent2, agent3; | 58 | public UUID agent1, agent2, agent3; |
59 | public static Random random; | 59 | public static Random random; |
60 | public ulong region1,region2,region3; | 60 | public ulong region1,region2,region3; |
61 | public TestCommunicationsManager cm; | ||
62 | public AgentCircuitData acd1; | 61 | public AgentCircuitData acd1; |
63 | public SceneObjectGroup sog1, sog2, sog3; | 62 | public SceneObjectGroup sog1, sog2, sog3; |
64 | public TestClient testclient; | 63 | public TestClient testclient; |
@@ -66,10 +65,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
66 | [TestFixtureSetUp] | 65 | [TestFixtureSetUp] |
67 | public void Init() | 66 | public void Init() |
68 | { | 67 | { |
69 | cm = new TestCommunicationsManager(); | 68 | scene = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); |
70 | scene = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000, cm); | 69 | scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000); |
71 | scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000, cm); | 70 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000); |
72 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); | ||
73 | 71 | ||
74 | ISharedRegionModule interregionComms = new LocalSimulationConnectorModule(); | 72 | ISharedRegionModule interregionComms = new LocalSimulationConnectorModule(); |
75 | interregionComms.Initialise(new IniConfigSource()); | 73 | interregionComms.Initialise(new IniConfigSource()); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index 8a27b7b..c77220c 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
132 | RegionInfo regionInfo = new RegionInfo(0,0,null,null); | 132 | RegionInfo regionInfo = new RegionInfo(0,0,null,null); |
133 | FakeStorageManager storageManager = new FakeStorageManager(); | 133 | FakeStorageManager storageManager = new FakeStorageManager(); |
134 | 134 | ||
135 | new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null); | 135 | new Scene(regionInfo, null, null, storageManager, null, false, false, false, null, null); |
136 | } | 136 | } |
137 | } | 137 | } |
138 | } | 138 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index a030dc4..cafe48a 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |||
@@ -113,17 +113,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
113 | 113 | ||
114 | UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100"); | 114 | UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100"); |
115 | UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200"); | 115 | UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200"); |
116 | TestCommunicationsManager cm = new TestCommunicationsManager(); | ||
117 | 116 | ||
118 | // shared module | 117 | // shared module |
119 | ISharedRegionModule interregionComms = new LocalSimulationConnectorModule(); | 118 | ISharedRegionModule interregionComms = new LocalSimulationConnectorModule(); |
120 | 119 | ||
121 | 120 | ||
122 | Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm, "grid"); | 121 | Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, "grid"); |
123 | SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms); | 122 | SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms); |
124 | sceneB.RegisterRegionWithGrid(); | 123 | sceneB.RegisterRegionWithGrid(); |
125 | 124 | ||
126 | Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm, "grid"); | 125 | Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, "grid"); |
127 | SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms); | 126 | SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms); |
128 | sceneA.RegisterRegionWithGrid(); | 127 | sceneA.RegisterRegionWithGrid(); |
129 | 128 | ||