From 3c90d834eac382af5edf091e83aea1ffcce91792 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 10 Jan 2010 22:41:42 +0000 Subject: Remove all references to master avatar, replacing with estate owner where appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. --- OpenSim/Region/Application/OpenSimBase.cs | 29 ---------------------- .../Region/ClientStack/LindenUDP/LLClientView.cs | 7 +----- .../World/Archiver/ArchiveReadRequest.cs | 16 +++++------- .../World/Estate/EstateManagementModule.cs | 18 ++------------ .../CoreModules/World/Land/LandManagementModule.cs | 15 +++-------- .../World/Permissions/PermissionsModule.cs | 6 ----- OpenSim/Region/DataSnapshot/EstateSnapshot.cs | 4 +-- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 ----- .../OptionalModules/Avatar/Chat/RegionState.cs | 4 --- .../Scripting/Minimodule/MRMModule.cs | 6 ++--- .../World/TreePopulator/TreePopulatorModule.cs | 4 --- 11 files changed, 16 insertions(+), 99 deletions(-) (limited to 'OpenSim/Region') 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 scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised()); scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight); - // TODO: Remove this cruft once MasterAvatar is fully deprecated - //Master Avatar Setup - UserProfileData masterAvatar; - if (scene.RegionInfo.MasterAvatarAssignedUUID == UUID.Zero) - { - masterAvatar = - m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, - scene.RegionInfo.MasterAvatarLastName, - scene.RegionInfo.MasterAvatarSandboxPassword); - } - else - { - masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarAssignedUUID); - scene.RegionInfo.MasterAvatarFirstName = masterAvatar.FirstName; - scene.RegionInfo.MasterAvatarLastName = masterAvatar.SurName; - } - - if (masterAvatar == null) - { - m_log.Info("[PARCEL]: No master avatar found, using null."); - scene.RegionInfo.MasterAvatarAssignedUUID = UUID.Zero; - } - else - { - m_log.InfoFormat("[PARCEL]: Found master avatar {0} {1} [" + masterAvatar.ID.ToString() + "]", - scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName); - scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; - } - return scene; } diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 3a802df..81fd86e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -4030,10 +4030,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); edata.CovenantID = covenant; edata.CovenantTimestamp = 0; - if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) - edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; - else - edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; + edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); einfopack.Data = edata; OutPacket(einfopack, ThrottleOutPacketType.Task); @@ -4054,8 +4051,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP //Sending Estate Settings returnblock[0].Parameter = Utils.StringToBytes(estateName); - // TODO: remove this cruft once MasterAvatar is fully deprecated - // returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 4c43389..cc5dfa1 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs @@ -182,10 +182,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver // Try to retain the original creator/owner/lastowner if their uuid is present on this grid // otherwise, use the master avatar uuid instead - UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID; - - if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) - masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner; // Reload serialized parcels m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels. Please wait.", serialisedParcels.Count); @@ -194,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver { LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); if (!ResolveUserUuid(parcel.OwnerID)) - parcel.OwnerID = masterAvatarId; + parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; landData.Add(parcel); } m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData); @@ -233,13 +229,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver foreach (SceneObjectPart part in sceneObject.Children.Values) { if (!ResolveUserUuid(part.CreatorID)) - part.CreatorID = masterAvatarId; + part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner; if (!ResolveUserUuid(part.OwnerID)) - part.OwnerID = masterAvatarId; + part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; if (!ResolveUserUuid(part.LastOwnerID)) - part.LastOwnerID = masterAvatarId; + part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; // And zap any troublesome sit target information part.SitTargetOrientation = new Quaternion(0, 0, 0, 1); @@ -255,11 +251,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver { if (!ResolveUserUuid(kvp.Value.OwnerID)) { - kvp.Value.OwnerID = masterAvatarId; + kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; } if (!ResolveUserUuid(kvp.Value.CreatorID)) { - kvp.Value.CreatorID = masterAvatarId; + kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner; } } } diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 5b82d4c..2109336 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs @@ -57,10 +57,7 @@ namespace OpenSim.Region.CoreModules.World.Estate if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800; UUID estateOwner; - if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) - estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; - else - estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; + estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; if (m_scene.Permissions.IsGod(remote_client.AgentId)) estateOwner = remote_client.AgentId; @@ -230,8 +227,6 @@ namespace OpenSim.Region.CoreModules.World.Estate if (user == m_scene.RegionInfo.EstateSettings.EstateOwner) return; // never process EO - if (user == m_scene.RegionInfo.MasterAvatarAssignedUUID) - return; // never process owner switch (estateAccessType) { @@ -741,14 +736,7 @@ namespace OpenSim.Region.CoreModules.World.Estate args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; args.regionFlags = GetRegionFlags(); args.regionName = m_scene.RegionInfo.RegionName; - if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) - args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; - else - args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; - - // Fudge estate owner - //if (m_scene.Permissions.IsGod(remoteClient.AgentId)) - // args.SimOwner = remoteClient.AgentId; + args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; args.terrainBase0 = UUID.Zero; args.terrainBase1 = UUID.Zero; @@ -1127,8 +1115,6 @@ namespace OpenSim.Region.CoreModules.World.Estate public bool IsManager(UUID avatarID) { - if (avatarID == m_scene.RegionInfo.MasterAvatarAssignedUUID) - return true; if (avatarID == m_scene.RegionInfo.EstateSettings.EstateOwner) return true; diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 9b39b09..f0c87f4 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -227,10 +227,7 @@ namespace OpenSim.Region.CoreModules.World.Land ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); - if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) - fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; - else - fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; + fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); AddLandObject(fullSimParcel); } @@ -1090,10 +1087,7 @@ namespace OpenSim.Region.CoreModules.World.Land { if (m_scene.Permissions.CanAbandonParcel(remote_client.AgentId, land)) { - if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) - land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; - else - land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; + land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; land.LandData.GroupID = UUID.Zero; land.LandData.IsGroupOwned = false; m_scene.ForEachClient(SendParcelOverlay); @@ -1114,10 +1108,7 @@ namespace OpenSim.Region.CoreModules.World.Land { if (m_scene.Permissions.CanReclaimParcel(remote_client.AgentId, land)) { - if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) - land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; - else - land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; + land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; land.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); land.LandData.GroupID = UUID.Zero; land.LandData.IsGroupOwned = false; diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index aaebd00..ee76440 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -477,12 +477,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions { if (user == UUID.Zero) return false; - if (m_scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero) - { - if (m_RegionOwnerIsGod && (m_scene.RegionInfo.MasterAvatarAssignedUUID == user)) - return true; - } - if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) { if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs index 9206a6d..27c82cd 100644 --- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs @@ -56,9 +56,7 @@ namespace OpenSim.Region.DataSnapshot.Providers //Now in DataSnapshotProvider module form! XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); - UUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID; - if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) - ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; + ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); //TODO: Change to query userserver about the master avatar UUID ? diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 476873a..e0da51b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -101,12 +101,6 @@ namespace OpenSim.Region.Framework.Scenes { userlevel = 1; } - // TODO: remove this cruft once MasterAvatar is fully deprecated - // - if (m_regInfo.MasterAvatarAssignedUUID == AgentID) - { - userlevel = 2; - } EventManager.TriggerOnNewInventoryItemUploadComplete(AgentID, item.AssetID, item.Name, userlevel); } else diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs index 773507c..53b103e 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/RegionState.cs @@ -57,8 +57,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat internal string Host = String.Empty; internal string LocX = String.Empty; internal string LocY = String.Empty; - internal string MA1 = String.Empty; - internal string MA2 = String.Empty; internal string IDK = String.Empty; // System values - used only be the IRC classes themselves @@ -85,8 +83,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat Host = scene.RegionInfo.ExternalHostName; LocX = Convert.ToString(scene.RegionInfo.RegionLocX); LocY = Convert.ToString(scene.RegionInfo.RegionLocY); - MA1 = scene.RegionInfo.MasterAvatarFirstName; - MA2 = scene.RegionInfo.MasterAvatarLastName; IDK = Convert.ToString(_idk_++); // OpenChannel conditionally establishes a connection to the diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index 4521f8e..19f9a82 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs @@ -212,8 +212,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule if (script.StartsWith("//MRM:C#")) { if (m_config.GetBoolean("OwnerOnly", true)) - if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID - || m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.MasterAvatarAssignedUUID) + if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.EstateSettings.EstateOwner) + || m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.EstateSettings.EstateOwner) return; script = ConvertMRMKeywords(script); @@ -280,7 +280,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host) { // UUID should be changed to object owner. - UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID; + UUID owner = m_scene.RegionInfo.EstateSettings.EstateOwner) SEUser securityUser = new SEUser(owner, "Name Unassigned"); SecurityCredential creds = new SecurityCredential(securityUser, m_scene); diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs index e3fbb6e..92a205b 100644 --- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs @@ -306,8 +306,6 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator m_log.InfoFormat("[TREES]: New tree planting for copse {0}", copsename); UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; - if (uuid == UUID.Zero) - uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; foreach (Copse copse in m_copse) { @@ -760,8 +758,6 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator Util.GetDistanceTo(position, copse.m_seed_point) <= copse.m_range) { UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; - if (uuid == UUID.Zero) - uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; CreateTree(uuid, copse, position); } -- cgit v1.1