diff options
Diffstat (limited to 'OpenSim/Region')
-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 e0b76f6..6efcd99 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -531,35 +531,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
531 | ISimulationDataService simDataService, IEstateDataService estateDataService, | 531 | ISimulationDataService simDataService, IEstateDataService estateDataService, |
532 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 532 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
533 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 533 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
534 | : this(regInfo) | ||
534 | { | 535 | { |
535 | m_config = config; | 536 | m_config = config; |
536 | MinFrameTime = 0.089f; | 537 | MinFrameTime = 0.089f; |
537 | 538 | ||
538 | Random random = new Random(); | 539 | Random random = new Random(); |
539 | |||
540 | BordersLocked = true; | ||
541 | |||
542 | Border northBorder = new Border(); | ||
543 | northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- | ||
544 | northBorder.CrossDirection = Cardinals.N; | ||
545 | NorthBorders.Add(northBorder); | ||
546 | |||
547 | Border southBorder = new Border(); | ||
548 | southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //---> | ||
549 | southBorder.CrossDirection = Cardinals.S; | ||
550 | SouthBorders.Add(southBorder); | ||
551 | |||
552 | Border eastBorder = new Border(); | ||
553 | eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- | ||
554 | eastBorder.CrossDirection = Cardinals.E; | ||
555 | EastBorders.Add(eastBorder); | ||
556 | |||
557 | Border westBorder = new Border(); | ||
558 | westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //---> | ||
559 | westBorder.CrossDirection = Cardinals.W; | ||
560 | WestBorders.Add(westBorder); | ||
561 | |||
562 | BordersLocked = false; | ||
563 | 540 | ||
564 | m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue/2))+(uint)(uint.MaxValue/4); | 541 | m_lastAllocatedLocalId = (uint)(random.NextDouble() * (double)(uint.MaxValue/2))+(uint)(uint.MaxValue/4); |
565 | m_moduleLoader = moduleLoader; | 542 | m_moduleLoader = moduleLoader; |
@@ -567,17 +544,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
567 | m_sceneGridService = sceneGridService; | 544 | m_sceneGridService = sceneGridService; |
568 | m_SimulationDataService = simDataService; | 545 | m_SimulationDataService = simDataService; |
569 | m_EstateDataService = estateDataService; | 546 | m_EstateDataService = estateDataService; |
570 | m_regInfo = regInfo; | ||
571 | m_regionHandle = m_regInfo.RegionHandle; | 547 | m_regionHandle = m_regInfo.RegionHandle; |
572 | m_regionName = m_regInfo.RegionName; | 548 | m_regionName = m_regInfo.RegionName; |
573 | m_lastUpdate = Util.EnvironmentTickCount(); | ||
574 | 549 | ||
575 | m_physicalPrim = physicalPrim; | 550 | m_physicalPrim = physicalPrim; |
576 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; | 551 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; |
577 | 552 | ||
578 | m_eventManager = new EventManager(); | ||
579 | m_permissions = new ScenePermissions(this); | ||
580 | |||
581 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); | 553 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); |
582 | m_asyncSceneObjectDeleter.Enabled = true; | 554 | m_asyncSceneObjectDeleter.Enabled = true; |
583 | 555 | ||