diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 9be94ce..ef3e722 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -239,10 +239,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
239 | ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); | 239 | ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); |
240 | 240 | ||
241 | fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); | 241 | fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); |
242 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 242 | fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
243 | fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
244 | else | ||
245 | fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
246 | fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); | 243 | fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); |
247 | AddLandObject(fullSimParcel); | 244 | AddLandObject(fullSimParcel); |
248 | } | 245 | } |
@@ -1214,10 +1211,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1214 | { | 1211 | { |
1215 | if (m_scene.Permissions.CanAbandonParcel(remote_client.AgentId, land)) | 1212 | if (m_scene.Permissions.CanAbandonParcel(remote_client.AgentId, land)) |
1216 | { | 1213 | { |
1217 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 1214 | land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
1218 | land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
1219 | else | ||
1220 | land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
1221 | land.LandData.GroupID = UUID.Zero; | 1215 | land.LandData.GroupID = UUID.Zero; |
1222 | land.LandData.IsGroupOwned = false; | 1216 | land.LandData.IsGroupOwned = false; |
1223 | m_scene.ForEachClient(SendParcelOverlay); | 1217 | m_scene.ForEachClient(SendParcelOverlay); |
@@ -1238,10 +1232,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1238 | { | 1232 | { |
1239 | if (m_scene.Permissions.CanReclaimParcel(remote_client.AgentId, land)) | 1233 | if (m_scene.Permissions.CanReclaimParcel(remote_client.AgentId, land)) |
1240 | { | 1234 | { |
1241 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 1235 | land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
1242 | land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
1243 | else | ||
1244 | land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
1245 | land.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); | 1236 | land.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); |
1246 | land.LandData.GroupID = UUID.Zero; | 1237 | land.LandData.GroupID = UUID.Zero; |
1247 | land.LandData.IsGroupOwned = false; | 1238 | land.LandData.IsGroupOwned = false; |