From 5648eb7bd1f2345aad1530d90964278fe352faea Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Aug 2015 15:52:26 -0700
Subject: Moved instantiation of SceneCommunicationService object to inside the
scene constructor. This was a left over from the original monolithic design
of scene communications. The less the instantiators of scenes know about the
scene's internals, the better.
---
OpenSim/Region/Application/OpenSimBase.cs | 4 +---
OpenSim/Region/Framework/Scenes/Scene.cs | 3 +--
OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 4 +---
OpenSim/Tests/Common/Mock/TestScene.cs | 4 ++--
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 3be411a..62a52d6 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -752,10 +752,8 @@ namespace OpenSim
Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
- SceneCommunicationService sceneGridService = new SceneCommunicationService();
-
return new Scene(
- regionInfo, circuitManager, physicsScene, sceneGridService,
+ regionInfo, circuitManager, physicsScene,
simDataService, estateDataService,
Config, m_version);
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fe99ae5..04e2664 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -851,7 +851,6 @@ namespace OpenSim.Region.Framework.Scenes
#region Constructors
public Scene(RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
- SceneCommunicationService sceneGridService,
ISimulationDataService simDataService, IEstateDataService estateDataService,
IConfigSource config, string simulatorVersion)
: this(regInfo, physicsScene)
@@ -865,7 +864,7 @@ namespace OpenSim.Region.Framework.Scenes
m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue / 2)) + (uint)(uint.MaxValue / 4);
m_authenticateHandler = authen;
- m_sceneGridService = sceneGridService;
+ m_sceneGridService = new SceneCommunicationService();
m_SimulationDataService = simDataService;
m_EstateDataService = estateDataService;
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 1fb1c5c..4f685b6 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -148,8 +148,6 @@ namespace OpenSim.Tests.Common
regInfo.RegionSizeX = sizeX;
regInfo.RegionSizeY = sizeY;
- SceneCommunicationService scs = new SceneCommunicationService();
-
PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ);
@@ -158,7 +156,7 @@ namespace OpenSim.Tests.Common
"basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent);
TestScene testScene = new TestScene(
- regInfo, m_acm, physicsScene, scs, SimDataService, m_estateDataService, configSource, null);
+ regInfo, m_acm, physicsScene, SimDataService, m_estateDataService, configSource, null);
INonSharedRegionModule godsModule = new GodsModule();
godsModule.Initialise(new IniConfigSource());
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 45acf91..bd36097 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -42,9 +42,9 @@ namespace OpenSim.Tests.Common
{
public TestScene(
RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
- SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
+ ISimulationDataService simDataService, IEstateDataService estateDataService,
IConfigSource config, string simulatorVersion)
- : base(regInfo, authen, physicsScene, sceneGridService, simDataService, estateDataService,
+ : base(regInfo, authen, physicsScene, simDataService, estateDataService,
config, simulatorVersion)
{
}
--
cgit v1.1