diff options
author | Melanie | 2010-01-10 22:41:42 +0000 |
---|---|---|
committer | Melanie | 2010-01-10 22:41:42 +0000 |
commit | 3c90d834eac382af5edf091e83aea1ffcce91792 (patch) | |
tree | 60662b0f13fab4e0d7a7ab93533e5e66edbecf68 /OpenSim/Region | |
parent | * Last reference to CommsManager.UserProfileCacheService removed (diff) | |
download | opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.zip opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.tar.gz opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.tar.bz2 opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.tar.xz |
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.
Diffstat (limited to '')
11 files changed, 16 insertions, 99 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 | ||
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 | |||
4030 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); | 4030 | EstateCovenantReplyPacket.DataBlock edata = new EstateCovenantReplyPacket.DataBlock(); |
4031 | edata.CovenantID = covenant; | 4031 | edata.CovenantID = covenant; |
4032 | edata.CovenantTimestamp = 0; | 4032 | edata.CovenantTimestamp = 0; |
4033 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 4033 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
4034 | edata.EstateOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
4035 | else | ||
4036 | edata.EstateOwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
4037 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); | 4034 | edata.EstateName = Utils.StringToBytes(m_scene.RegionInfo.EstateSettings.EstateName); |
4038 | einfopack.Data = edata; | 4035 | einfopack.Data = edata; |
4039 | OutPacket(einfopack, ThrottleOutPacketType.Task); | 4036 | OutPacket(einfopack, ThrottleOutPacketType.Task); |
@@ -4054,8 +4051,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4054 | 4051 | ||
4055 | //Sending Estate Settings | 4052 | //Sending Estate Settings |
4056 | returnblock[0].Parameter = Utils.StringToBytes(estateName); | 4053 | returnblock[0].Parameter = Utils.StringToBytes(estateName); |
4057 | // TODO: remove this cruft once MasterAvatar is fully deprecated | ||
4058 | // | ||
4059 | returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); | 4054 | returnblock[1].Parameter = Utils.StringToBytes(estateOwner.ToString()); |
4060 | returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); | 4055 | returnblock[2].Parameter = Utils.StringToBytes(estateID.ToString()); |
4061 | 4056 | ||
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 | |||
182 | 182 | ||
183 | // Try to retain the original creator/owner/lastowner if their uuid is present on this grid | 183 | // Try to retain the original creator/owner/lastowner if their uuid is present on this grid |
184 | // otherwise, use the master avatar uuid instead | 184 | // otherwise, use the master avatar uuid instead |
185 | UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
186 | |||
187 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | ||
188 | masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
189 | 185 | ||
190 | // Reload serialized parcels | 186 | // Reload serialized parcels |
191 | m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels. Please wait.", serialisedParcels.Count); | 187 | m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels. Please wait.", serialisedParcels.Count); |
@@ -194,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
194 | { | 190 | { |
195 | LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); | 191 | LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); |
196 | if (!ResolveUserUuid(parcel.OwnerID)) | 192 | if (!ResolveUserUuid(parcel.OwnerID)) |
197 | parcel.OwnerID = masterAvatarId; | 193 | parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
198 | landData.Add(parcel); | 194 | landData.Add(parcel); |
199 | } | 195 | } |
200 | m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData); | 196 | m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData); |
@@ -233,13 +229,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
233 | foreach (SceneObjectPart part in sceneObject.Children.Values) | 229 | foreach (SceneObjectPart part in sceneObject.Children.Values) |
234 | { | 230 | { |
235 | if (!ResolveUserUuid(part.CreatorID)) | 231 | if (!ResolveUserUuid(part.CreatorID)) |
236 | part.CreatorID = masterAvatarId; | 232 | part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
237 | 233 | ||
238 | if (!ResolveUserUuid(part.OwnerID)) | 234 | if (!ResolveUserUuid(part.OwnerID)) |
239 | part.OwnerID = masterAvatarId; | 235 | part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
240 | 236 | ||
241 | if (!ResolveUserUuid(part.LastOwnerID)) | 237 | if (!ResolveUserUuid(part.LastOwnerID)) |
242 | part.LastOwnerID = masterAvatarId; | 238 | part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
243 | 239 | ||
244 | // And zap any troublesome sit target information | 240 | // And zap any troublesome sit target information |
245 | part.SitTargetOrientation = new Quaternion(0, 0, 0, 1); | 241 | part.SitTargetOrientation = new Quaternion(0, 0, 0, 1); |
@@ -255,11 +251,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
255 | { | 251 | { |
256 | if (!ResolveUserUuid(kvp.Value.OwnerID)) | 252 | if (!ResolveUserUuid(kvp.Value.OwnerID)) |
257 | { | 253 | { |
258 | kvp.Value.OwnerID = masterAvatarId; | 254 | kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
259 | } | 255 | } |
260 | if (!ResolveUserUuid(kvp.Value.CreatorID)) | 256 | if (!ResolveUserUuid(kvp.Value.CreatorID)) |
261 | { | 257 | { |
262 | kvp.Value.CreatorID = masterAvatarId; | 258 | kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
263 | } | 259 | } |
264 | } | 260 | } |
265 | } | 261 | } |
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 | |||
57 | if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) | 57 | if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) |
58 | sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800; | 58 | sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800; |
59 | UUID estateOwner; | 59 | UUID estateOwner; |
60 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 60 | estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; |
61 | estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
62 | else | ||
63 | estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
64 | 61 | ||
65 | if (m_scene.Permissions.IsGod(remote_client.AgentId)) | 62 | if (m_scene.Permissions.IsGod(remote_client.AgentId)) |
66 | estateOwner = remote_client.AgentId; | 63 | estateOwner = remote_client.AgentId; |
@@ -230,8 +227,6 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
230 | 227 | ||
231 | if (user == m_scene.RegionInfo.EstateSettings.EstateOwner) | 228 | if (user == m_scene.RegionInfo.EstateSettings.EstateOwner) |
232 | return; // never process EO | 229 | return; // never process EO |
233 | if (user == m_scene.RegionInfo.MasterAvatarAssignedUUID) | ||
234 | return; // never process owner | ||
235 | 230 | ||
236 | switch (estateAccessType) | 231 | switch (estateAccessType) |
237 | { | 232 | { |
@@ -741,14 +736,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
741 | args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; | 736 | args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; |
742 | args.regionFlags = GetRegionFlags(); | 737 | args.regionFlags = GetRegionFlags(); |
743 | args.regionName = m_scene.RegionInfo.RegionName; | 738 | args.regionName = m_scene.RegionInfo.RegionName; |
744 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 739 | args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; |
745 | args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
746 | else | ||
747 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
748 | |||
749 | // Fudge estate owner | ||
750 | //if (m_scene.Permissions.IsGod(remoteClient.AgentId)) | ||
751 | // args.SimOwner = remoteClient.AgentId; | ||
752 | 740 | ||
753 | args.terrainBase0 = UUID.Zero; | 741 | args.terrainBase0 = UUID.Zero; |
754 | args.terrainBase1 = UUID.Zero; | 742 | args.terrainBase1 = UUID.Zero; |
@@ -1127,8 +1115,6 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1127 | 1115 | ||
1128 | public bool IsManager(UUID avatarID) | 1116 | public bool IsManager(UUID avatarID) |
1129 | { | 1117 | { |
1130 | if (avatarID == m_scene.RegionInfo.MasterAvatarAssignedUUID) | ||
1131 | return true; | ||
1132 | if (avatarID == m_scene.RegionInfo.EstateSettings.EstateOwner) | 1118 | if (avatarID == m_scene.RegionInfo.EstateSettings.EstateOwner) |
1133 | return true; | 1119 | return true; |
1134 | 1120 | ||
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 | |||
227 | ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); | 227 | ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); |
228 | 228 | ||
229 | fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); | 229 | fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); |
230 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 230 | fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
231 | fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
232 | else | ||
233 | fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
234 | fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); | 231 | fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); |
235 | AddLandObject(fullSimParcel); | 232 | AddLandObject(fullSimParcel); |
236 | } | 233 | } |
@@ -1090,10 +1087,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1090 | { | 1087 | { |
1091 | if (m_scene.Permissions.CanAbandonParcel(remote_client.AgentId, land)) | 1088 | if (m_scene.Permissions.CanAbandonParcel(remote_client.AgentId, land)) |
1092 | { | 1089 | { |
1093 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 1090 | land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
1094 | land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
1095 | else | ||
1096 | land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
1097 | land.LandData.GroupID = UUID.Zero; | 1091 | land.LandData.GroupID = UUID.Zero; |
1098 | land.LandData.IsGroupOwned = false; | 1092 | land.LandData.IsGroupOwned = false; |
1099 | m_scene.ForEachClient(SendParcelOverlay); | 1093 | m_scene.ForEachClient(SendParcelOverlay); |
@@ -1114,10 +1108,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1114 | { | 1108 | { |
1115 | if (m_scene.Permissions.CanReclaimParcel(remote_client.AgentId, land)) | 1109 | if (m_scene.Permissions.CanReclaimParcel(remote_client.AgentId, land)) |
1116 | { | 1110 | { |
1117 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 1111 | land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
1118 | land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
1119 | else | ||
1120 | land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
1121 | land.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); | 1112 | land.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); |
1122 | land.LandData.GroupID = UUID.Zero; | 1113 | land.LandData.GroupID = UUID.Zero; |
1123 | land.LandData.IsGroupOwned = false; | 1114 | 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 | |||
477 | { | 477 | { |
478 | if (user == UUID.Zero) return false; | 478 | if (user == UUID.Zero) return false; |
479 | 479 | ||
480 | if (m_scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero) | ||
481 | { | ||
482 | if (m_RegionOwnerIsGod && (m_scene.RegionInfo.MasterAvatarAssignedUUID == user)) | ||
483 | return true; | ||
484 | } | ||
485 | |||
486 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 480 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) |
487 | { | 481 | { |
488 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) | 482 | 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 | |||
56 | //Now in DataSnapshotProvider module form! | 56 | //Now in DataSnapshotProvider module form! |
57 | XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); | 57 | XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); |
58 | 58 | ||
59 | UUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 59 | ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; |
60 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | ||
61 | ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
62 | 60 | ||
63 | UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); | 61 | UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); |
64 | //TODO: Change to query userserver about the master avatar UUID ? | 62 | //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 | |||
101 | { | 101 | { |
102 | userlevel = 1; | 102 | userlevel = 1; |
103 | } | 103 | } |
104 | // TODO: remove this cruft once MasterAvatar is fully deprecated | ||
105 | // | ||
106 | if (m_regInfo.MasterAvatarAssignedUUID == AgentID) | ||
107 | { | ||
108 | userlevel = 2; | ||
109 | } | ||
110 | EventManager.TriggerOnNewInventoryItemUploadComplete(AgentID, item.AssetID, item.Name, userlevel); | 104 | EventManager.TriggerOnNewInventoryItemUploadComplete(AgentID, item.AssetID, item.Name, userlevel); |
111 | } | 105 | } |
112 | else | 106 | 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 | |||
57 | internal string Host = String.Empty; | 57 | internal string Host = String.Empty; |
58 | internal string LocX = String.Empty; | 58 | internal string LocX = String.Empty; |
59 | internal string LocY = String.Empty; | 59 | internal string LocY = String.Empty; |
60 | internal string MA1 = String.Empty; | ||
61 | internal string MA2 = String.Empty; | ||
62 | internal string IDK = String.Empty; | 60 | internal string IDK = String.Empty; |
63 | 61 | ||
64 | // System values - used only be the IRC classes themselves | 62 | // System values - used only be the IRC classes themselves |
@@ -85,8 +83,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat | |||
85 | Host = scene.RegionInfo.ExternalHostName; | 83 | Host = scene.RegionInfo.ExternalHostName; |
86 | LocX = Convert.ToString(scene.RegionInfo.RegionLocX); | 84 | LocX = Convert.ToString(scene.RegionInfo.RegionLocX); |
87 | LocY = Convert.ToString(scene.RegionInfo.RegionLocY); | 85 | LocY = Convert.ToString(scene.RegionInfo.RegionLocY); |
88 | MA1 = scene.RegionInfo.MasterAvatarFirstName; | ||
89 | MA2 = scene.RegionInfo.MasterAvatarLastName; | ||
90 | IDK = Convert.ToString(_idk_++); | 86 | IDK = Convert.ToString(_idk_++); |
91 | 87 | ||
92 | // OpenChannel conditionally establishes a connection to the | 88 | // 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 | |||
212 | if (script.StartsWith("//MRM:C#")) | 212 | if (script.StartsWith("//MRM:C#")) |
213 | { | 213 | { |
214 | if (m_config.GetBoolean("OwnerOnly", true)) | 214 | if (m_config.GetBoolean("OwnerOnly", true)) |
215 | if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID | 215 | if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.EstateSettings.EstateOwner) |
216 | || m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.MasterAvatarAssignedUUID) | 216 | || m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.EstateSettings.EstateOwner) |
217 | return; | 217 | return; |
218 | 218 | ||
219 | script = ConvertMRMKeywords(script); | 219 | script = ConvertMRMKeywords(script); |
@@ -280,7 +280,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
280 | public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host) | 280 | public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host) |
281 | { | 281 | { |
282 | // UUID should be changed to object owner. | 282 | // UUID should be changed to object owner. |
283 | UUID owner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 283 | UUID owner = m_scene.RegionInfo.EstateSettings.EstateOwner) |
284 | SEUser securityUser = new SEUser(owner, "Name Unassigned"); | 284 | SEUser securityUser = new SEUser(owner, "Name Unassigned"); |
285 | SecurityCredential creds = new SecurityCredential(securityUser, m_scene); | 285 | SecurityCredential creds = new SecurityCredential(securityUser, m_scene); |
286 | 286 | ||
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 | |||
306 | 306 | ||
307 | m_log.InfoFormat("[TREES]: New tree planting for copse {0}", copsename); | 307 | m_log.InfoFormat("[TREES]: New tree planting for copse {0}", copsename); |
308 | UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; | 308 | UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; |
309 | if (uuid == UUID.Zero) | ||
310 | uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
311 | 309 | ||
312 | foreach (Copse copse in m_copse) | 310 | foreach (Copse copse in m_copse) |
313 | { | 311 | { |
@@ -760,8 +758,6 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator | |||
760 | Util.GetDistanceTo(position, copse.m_seed_point) <= copse.m_range) | 758 | Util.GetDistanceTo(position, copse.m_seed_point) <= copse.m_range) |
761 | { | 759 | { |
762 | UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; | 760 | UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; |
763 | if (uuid == UUID.Zero) | ||
764 | uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
765 | 761 | ||
766 | CreateTree(uuid, copse, position); | 762 | CreateTree(uuid, copse, position); |
767 | } | 763 | } |