aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-05-07 01:00:58 +0100
committerMelanie2010-05-07 01:00:58 +0100
commitb309781f2dd5f7ab416c7204189af2f495fdb3dc (patch)
treee4db5396c9f077b5899ed69274cf7a5f8b4902cd /OpenSim
parentRevert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for... (diff)
parentAlso remove sale and search flags on god owner change. (diff)
downloadopensim-SC-b309781f2dd5f7ab416c7204189af2f495fdb3dc.zip
opensim-SC-b309781f2dd5f7ab416c7204189af2f495fdb3dc.tar.gz
opensim-SC-b309781f2dd5f7ab416c7204189af2f495fdb3dc.tar.bz2
opensim-SC-b309781f2dd5f7ab416c7204189af2f495fdb3dc.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index ae60c83..d05235e 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1156,6 +1156,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1156 land.LandData.OwnerID = ownerID; 1156 land.LandData.OwnerID = ownerID;
1157 land.LandData.GroupID = UUID.Zero; 1157 land.LandData.GroupID = UUID.Zero;
1158 land.LandData.IsGroupOwned = false; 1158 land.LandData.IsGroupOwned = false;
1159 land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
1159 1160
1160 m_scene.ForEachClient(SendParcelOverlay); 1161 m_scene.ForEachClient(SendParcelOverlay);
1161 land.SendLandUpdateToClient(true, remote_client); 1162 land.SendLandUpdateToClient(true, remote_client);
@@ -1178,6 +1179,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1178 land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; 1179 land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
1179 land.LandData.GroupID = UUID.Zero; 1180 land.LandData.GroupID = UUID.Zero;
1180 land.LandData.IsGroupOwned = false; 1181 land.LandData.IsGroupOwned = false;
1182 land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
1181 m_scene.ForEachClient(SendParcelOverlay); 1183 m_scene.ForEachClient(SendParcelOverlay);
1182 land.SendLandUpdateToClient(true, remote_client); 1184 land.SendLandUpdateToClient(true, remote_client);
1183 } 1185 }