aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs43
1 files changed, 3 insertions, 40 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f3aaa76..831269c 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -36,8 +36,7 @@ using Nini.Config;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Services; 39
40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
42using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
43using OpenSim.Framework.Servers.HttpServer; 42using OpenSim.Framework.Servers.HttpServer;
@@ -85,8 +84,6 @@ namespace OpenSim
85 84
86 protected ConfigurationLoader m_configLoader; 85 protected ConfigurationLoader m_configLoader;
87 86
88 protected GridInfoService m_gridInfoService;
89
90 public ConsoleCommand CreateAccount = null; 87 public ConsoleCommand CreateAccount = null;
91 88
92 protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>(); 89 protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
@@ -600,35 +597,6 @@ namespace OpenSim
600 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); 597 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
601 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); 598 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight);
602 599
603 // TODO: Remove this cruft once MasterAvatar is fully deprecated
604 //Master Avatar Setup
605 UserProfileData masterAvatar;
606 if (scene.RegionInfo.MasterAvatarAssignedUUID == UUID.Zero)
607 {
608 masterAvatar =
609 m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
610 scene.RegionInfo.MasterAvatarLastName,
611 scene.RegionInfo.MasterAvatarSandboxPassword);
612 }
613 else
614 {
615 masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID);
616 scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName;
617 scene.RegionInfo.MasterAvatarLastName = masterAvatar.SurName;
618 }
619
620 if (masterAvatar == null)
621 {
622 m_log.Info("[PARCEL]: No master avatar found, using null.");
623 scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero;
624 }
625 else
626 {
627 m_log.InfoFormat("[PARCEL]: Found master avatar {0} {1} [" + masterAvatar.ID.ToString() + "]",
628 scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName);
629 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
630 }
631
632 return scene; 600 return scene;
633 } 601 }
634 602
@@ -651,15 +619,10 @@ namespace OpenSim
651 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, 619 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
652 AgentCircuitManager circuitManager) 620 AgentCircuitManager circuitManager)
653 { 621 {
654 bool hgrid = ConfigSource.Source.Configs["Startup"].GetBoolean("hypergrid", false); 622 SceneCommunicationService sceneGridService = new SceneCommunicationService();
655 if (hgrid)
656 return HGCommands.CreateScene(regionInfo, circuitManager, m_commsManager,
657 storageManager, m_moduleLoader, m_configSettings, m_config, m_version);
658
659 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager);
660 623
661 return new Scene( 624 return new Scene(
662 regionInfo, circuitManager, m_commsManager, sceneGridService, 625 regionInfo, circuitManager, sceneGridService,
663 storageManager, m_moduleLoader, false, m_configSettings.PhysicalPrim, 626 storageManager, m_moduleLoader, false, m_configSettings.PhysicalPrim,
664 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 627 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
665 } 628 }