aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-05-06 16:07:15 +0100
committerMelanie2010-05-06 16:07:15 +0100
commitadc34c712967e1d90aaa11e2bd9ff538da1641c0 (patch)
treefe5c837139fe3fa9643330479fb979ce3c25d974 /OpenSim
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-adc34c712967e1d90aaa11e2bd9ff538da1641c0.zip
opensim-SC_OLD-adc34c712967e1d90aaa11e2bd9ff538da1641c0.tar.gz
opensim-SC_OLD-adc34c712967e1d90aaa11e2bd9ff538da1641c0.tar.bz2
opensim-SC_OLD-adc34c712967e1d90aaa11e2bd9ff538da1641c0.tar.xz
Ensure the show in search flag is cleared on ownership change. Also, when
land is reclaimed, reset it's for sale flags so it can't be bought again right away.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs5
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 5750aa4..a691acd 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1188,6 +1188,10 @@ namespace OpenSim.Region.CoreModules.World.Land
1188 land.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); 1188 land.LandData.ClaimDate = Util.UnixTimeSinceEpoch();
1189 land.LandData.GroupID = UUID.Zero; 1189 land.LandData.GroupID = UUID.Zero;
1190 land.LandData.IsGroupOwned = false; 1190 land.LandData.IsGroupOwned = false;
1191 land.LandData.SalePrice = 0;
1192 land.LandData.AuthBuyerID = UUID.Zero;
1193 land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
1194
1191 m_scene.ForEachClient(SendParcelOverlay); 1195 m_scene.ForEachClient(SendParcelOverlay);
1192 land.SendLandUpdateToClient(true, remote_client); 1196 land.SendLandUpdateToClient(true, remote_client);
1193 } 1197 }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index aca5514..3945142 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -247,7 +247,7 @@ namespace OpenSim.Region.CoreModules.World.Land
247 newData.ClaimPrice = claimprice; 247 newData.ClaimPrice = claimprice;
248 newData.SalePrice = 0; 248 newData.SalePrice = 0;
249 newData.AuthBuyerID = UUID.Zero; 249 newData.AuthBuyerID = UUID.Zero;
250 newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects); 250 newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
251 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData); 251 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
252 252
253 SendLandUpdateToAvatarsOverMe(true); 253 SendLandUpdateToAvatarsOverMe(true);
@@ -260,6 +260,9 @@ namespace OpenSim.Region.CoreModules.World.Land
260 newData.GroupID = groupID; 260 newData.GroupID = groupID;
261 newData.IsGroupOwned = true; 261 newData.IsGroupOwned = true;
262 262
263 // Reset show in directory flag on deed
264 newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
265
263 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData); 266 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
264 267
265 SendLandUpdateToAvatarsOverMe(true); 268 SendLandUpdateToAvatarsOverMe(true);