aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs16
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs18
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs15
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs6
4 files changed, 11 insertions, 44 deletions
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)