diff options
Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 8707737..8aadcc1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -550,35 +550,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
550 | ISimulationDataService simDataService, IEstateDataService estateDataService, | 550 | ISimulationDataService simDataService, IEstateDataService estateDataService, |
551 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 551 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
552 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 552 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
553 | : this(regInfo) | ||
553 | { | 554 | { |
554 | m_config = config; | 555 | m_config = config; |
555 | MinFrameTime = 0.089f; | 556 | MinFrameTime = 0.089f; |
556 | 557 | ||
557 | Random random = new Random(); | 558 | Random random = new Random(); |
558 | |||
559 | BordersLocked = true; | ||
560 | |||
561 | Border northBorder = new Border(); | ||
562 | northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- | ||
563 | northBorder.CrossDirection = Cardinals.N; | ||
564 | NorthBorders.Add(northBorder); | ||
565 | |||
566 | Border southBorder = new Border(); | ||
567 | southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //---> | ||
568 | southBorder.CrossDirection = Cardinals.S; | ||
569 | SouthBorders.Add(southBorder); | ||
570 | |||
571 | Border eastBorder = new Border(); | ||
572 | eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- | ||
573 | eastBorder.CrossDirection = Cardinals.E; | ||
574 | EastBorders.Add(eastBorder); | ||
575 | |||
576 | Border westBorder = new Border(); | ||
577 | westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //---> | ||
578 | westBorder.CrossDirection = Cardinals.W; | ||
579 | WestBorders.Add(westBorder); | ||
580 | |||
581 | BordersLocked = false; | ||
582 | 559 | ||
583 | m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue/2))+(uint)(uint.MaxValue/4); | 560 | m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue/2))+(uint)(uint.MaxValue/4); |
584 | m_moduleLoader = moduleLoader; | 561 | m_moduleLoader = moduleLoader; |
@@ -586,10 +563,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
586 | m_sceneGridService = sceneGridService; | 563 | m_sceneGridService = sceneGridService; |
587 | m_SimulationDataService = simDataService; | 564 | m_SimulationDataService = simDataService; |
588 | m_EstateDataService = estateDataService; | 565 | m_EstateDataService = estateDataService; |
589 | m_regInfo = regInfo; | ||
590 | m_regionHandle = m_regInfo.RegionHandle; | 566 | m_regionHandle = m_regInfo.RegionHandle; |
591 | m_regionName = m_regInfo.RegionName; | 567 | m_regionName = m_regInfo.RegionName; |
592 | m_datastore = m_regInfo.DataStore; | ||
593 | m_lastUpdate = Util.EnvironmentTickCount(); | 568 | m_lastUpdate = Util.EnvironmentTickCount(); |
594 | m_lastIncoming = 0; | 569 | m_lastIncoming = 0; |
595 | m_lastOutgoing = 0; | 570 | m_lastOutgoing = 0; |
@@ -597,9 +572,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
597 | m_physicalPrim = physicalPrim; | 572 | m_physicalPrim = physicalPrim; |
598 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; | 573 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; |
599 | 574 | ||
600 | m_eventManager = new EventManager(); | ||
601 | m_permissions = new ScenePermissions(this); | ||
602 | |||
603 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); | 575 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); |
604 | m_asyncSceneObjectDeleter.Enabled = true; | 576 | m_asyncSceneObjectDeleter.Enabled = true; |
605 | 577 | ||