aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorDiva Canto2015-08-30 15:52:26 -0700
committerDiva Canto2015-08-30 15:52:26 -0700
commit5648eb7bd1f2345aad1530d90964278fe352faea (patch)
tree5a1a83404deb6aea7bb4780beb9a65aeb679ae2a /OpenSim/Region/Framework/Scenes/Scene.cs
parentMantis #7713: fixed bug introduced by 1st MOSES patch. (diff)
downloadopensim-SC_OLD-5648eb7bd1f2345aad1530d90964278fe352faea.zip
opensim-SC_OLD-5648eb7bd1f2345aad1530d90964278fe352faea.tar.gz
opensim-SC_OLD-5648eb7bd1f2345aad1530d90964278fe352faea.tar.bz2
opensim-SC_OLD-5648eb7bd1f2345aad1530d90964278fe352faea.tar.xz
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.
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs3
1 files changed, 1 insertions, 2 deletions
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
851 #region Constructors 851 #region Constructors
852 852
853 public Scene(RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene, 853 public Scene(RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene,
854 SceneCommunicationService sceneGridService,
855 ISimulationDataService simDataService, IEstateDataService estateDataService, 854 ISimulationDataService simDataService, IEstateDataService estateDataService,
856 IConfigSource config, string simulatorVersion) 855 IConfigSource config, string simulatorVersion)
857 : this(regInfo, physicsScene) 856 : this(regInfo, physicsScene)
@@ -865,7 +864,7 @@ namespace OpenSim.Region.Framework.Scenes
865 864
866 m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue / 2)) + (uint)(uint.MaxValue / 4); 865 m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue / 2)) + (uint)(uint.MaxValue / 4);
867 m_authenticateHandler = authen; 866 m_authenticateHandler = authen;
868 m_sceneGridService = sceneGridService; 867 m_sceneGridService = new SceneCommunicationService();
869 m_SimulationDataService = simDataService; 868 m_SimulationDataService = simDataService;
870 m_EstateDataService = estateDataService; 869 m_EstateDataService = estateDataService;
871 870