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.cs40
1 files changed, 4 insertions, 36 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index cf2ab65..f265769 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>();
@@ -555,35 +552,6 @@ namespace OpenSim
555 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); 552 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
556 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); 553 scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight);
557 554
558 // TODO: Remove this cruft once MasterAvatar is fully deprecated
559 //Master Avatar Setup
560 UserProfileData masterAvatar;
561 if (scene.RegionInfo.MasterAvatarAssignedUUID == UUID.Zero)
562 {
563 masterAvatar =
564 m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
565 scene.RegionInfo.MasterAvatarLastName,
566 scene.RegionInfo.MasterAvatarSandboxPassword);
567 }
568 else
569 {
570 masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID);
571 scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName;
572 scene.RegionInfo.MasterAvatarLastName = masterAvatar.SurName;
573 }
574
575 if (masterAvatar == null)
576 {
577 m_log.Info("[PARCEL]: No master avatar found, using null.");
578 scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero;
579 }
580 else
581 {
582 m_log.InfoFormat("[PARCEL]: Found master avatar {0} {1} [" + masterAvatar.ID.ToString() + "]",
583 scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName);
584 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
585 }
586
587 return scene; 555 return scene;
588 } 556 }
589 557
@@ -608,13 +576,13 @@ namespace OpenSim
608 { 576 {
609 bool hgrid = ConfigSource.Source.Configs["Startup"].GetBoolean("hypergrid", false); 577 bool hgrid = ConfigSource.Source.Configs["Startup"].GetBoolean("hypergrid", false);
610 if (hgrid) 578 if (hgrid)
611 return HGCommands.CreateScene(regionInfo, circuitManager, m_commsManager, 579 return HGCommands.CreateScene(regionInfo, circuitManager,
612 storageManager, m_moduleLoader, m_configSettings, m_config, m_version); 580 storageManager, m_moduleLoader, m_configSettings, m_config, m_version);
613 581
614 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); 582 SceneCommunicationService sceneGridService = new SceneCommunicationService();
615 583
616 return new Scene( 584 return new Scene(
617 regionInfo, circuitManager, m_commsManager, sceneGridService, 585 regionInfo, circuitManager, sceneGridService,
618 storageManager, m_moduleLoader, false, m_configSettings.PhysicalPrim, 586 storageManager, m_moduleLoader, false, m_configSettings.PhysicalPrim,
619 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 587 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
620 } 588 }