diff options
author | Diva Canto | 2010-01-10 15:35:15 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 15:35:15 -0800 |
commit | c0642bf7e06924397894229677235e2a841768bc (patch) | |
tree | 3d052597318fd29e107662ab29bb831ff8380582 /OpenSim/Region/Application | |
parent | * Changed IPresenceService Logout, so that it takes a position and a lookat (diff) | |
parent | Remove all references to master avatar, replacing with estate owner where (diff) | |
download | opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.zip opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.gz opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.bz2 opensim-SC_OLD-c0642bf7e06924397894229677235e2a841768bc.tar.xz |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 391856b..2db17b1 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -586,35 +586,6 @@ namespace OpenSim | |||
586 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); | 586 | scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); |
587 | scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); | 587 | scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); |
588 | 588 | ||
589 | // TODO: Remove this cruft once MasterAvatar is fully deprecated | ||
590 | //Master Avatar Setup | ||
591 | UserProfileData masterAvatar; | ||
592 | if (scene.RegionInfo.MasterAvatarAssignedUUID == UUID.Zero) | ||
593 | { | ||
594 | masterAvatar = | ||
595 | m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, | ||
596 | scene.RegionInfo.MasterAvatarLastName, | ||
597 | scene.RegionInfo.MasterAvatarSandboxPassword); | ||
598 | } | ||
599 | else | ||
600 | { | ||
601 | masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID); | ||
602 | scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName; | ||
603 | scene.RegionInfo.MasterAvatarLastName = masterAvatar.SurName; | ||
604 | } | ||
605 | |||
606 | if (masterAvatar == null) | ||
607 | { | ||
608 | m_log.Info("[PARCEL]: No master avatar found, using null."); | ||
609 | scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero; | ||
610 | } | ||
611 | else | ||
612 | { | ||
613 | m_log.InfoFormat("[PARCEL]: Found master avatar {0} {1} [" + masterAvatar.ID.ToString() + "]", | ||
614 | scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName); | ||
615 | scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; | ||
616 | } | ||
617 | |||
618 | return scene; | 589 | return scene; |
619 | } | 590 | } |
620 | 591 | ||