diff options
author | Teravus Ovares | 2009-07-25 15:49:10 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-07-25 15:49:10 +0000 |
commit | 64bd9a335444379ebe1cad8e34d5b5953a76f671 (patch) | |
tree | 66b9ce07dbf95e4c118e3d639068e2c44fc52f58 /OpenSim/Region/CoreModules/World/Land | |
parent | * Apply http://opensimulator.org/mantis/view.php?id=3586 (diff) | |
download | opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.zip opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.gz opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.bz2 opensim-SC_OLD-64bd9a335444379ebe1cad8e34d5b5953a76f671.tar.xz |
* Updates libOMV to version 0.7.0
* Uses mantis #3811 as a base (thanks jhuliman) with changes.
* E-mail regarding interface changes sent to the opensim-dev list
* Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 4c108f5..e385ae0 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -301,12 +301,12 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
301 | { | 301 | { |
302 | if (checkBan.isBannedFromLand(avatar.AgentId)) | 302 | if (checkBan.isBannedFromLand(avatar.AgentId)) |
303 | { | 303 | { |
304 | checkBan.sendLandProperties((int)ParcelStatus.CollisionBanned, false, (int)ParcelResult.Single, avatar); | 304 | checkBan.sendLandProperties((int)ParcelPropertiesStatus.CollisionBanned, false, (int)ParcelResult.Single, avatar); |
305 | return; //Only send one | 305 | return; //Only send one |
306 | } | 306 | } |
307 | if (checkBan.isRestrictedFromLand(avatar.AgentId)) | 307 | if (checkBan.isRestrictedFromLand(avatar.AgentId)) |
308 | { | 308 | { |
309 | checkBan.sendLandProperties((int)ParcelStatus.CollisionNotOnAccessList, false, (int)ParcelResult.Single, avatar); | 309 | checkBan.sendLandProperties((int)ParcelPropertiesStatus.CollisionNotOnAccessList, false, (int)ParcelResult.Single, avatar); |
310 | return; //Only send one | 310 | return; //Only send one |
311 | } | 311 | } |
312 | } | 312 | } |
@@ -1116,7 +1116,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1116 | UUID pOwnerID = lob.landData.OwnerID; | 1116 | UUID pOwnerID = lob.landData.OwnerID; |
1117 | 1117 | ||
1118 | bool landforsale = ((lob.landData.Flags & | 1118 | bool landforsale = ((lob.landData.Flags & |
1119 | (uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0); | 1119 | (uint)(ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects)) != 0); |
1120 | if ((AuthorizedID == UUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale) | 1120 | if ((AuthorizedID == UUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale) |
1121 | { | 1121 | { |
1122 | // TODO I don't think we have to lock it here, no? | 1122 | // TODO I don't think we have to lock it here, no? |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index b800bb3..715b48d 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
167 | 167 | ||
168 | // In a perfect world, this would have worked. | 168 | // In a perfect world, this would have worked. |
169 | // | 169 | // |
170 | // if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) | 170 | // if ((landData.Flags & (uint)ParcelFlags.AllowLandmark) != 0) |
171 | // regionFlags |= (uint)RegionFlags.AllowLandmark; | 171 | // regionFlags |= (uint)RegionFlags.AllowLandmark; |
172 | // if (landData.OwnerID == remote_client.AgentId) | 172 | // if (landData.OwnerID == remote_client.AgentId) |
173 | // regionFlags |= (uint)RegionFlags.AllowSetHome; | 173 | // regionFlags |= (uint)RegionFlags.AllowSetHome; |
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
226 | newData.ClaimPrice = claimprice; | 226 | newData.ClaimPrice = claimprice; |
227 | newData.SalePrice = 0; | 227 | newData.SalePrice = 0; |
228 | newData.AuthBuyerID = UUID.Zero; | 228 | newData.AuthBuyerID = UUID.Zero; |
229 | newData.Flags &= ~(uint) (Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects); | 229 | newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects); |
230 | m_scene.LandChannel.UpdateLandObject(landData.LocalID, newData); | 230 | m_scene.LandChannel.UpdateLandObject(landData.LocalID, newData); |
231 | 231 | ||
232 | sendLandUpdateToAvatarsOverMe(); | 232 | sendLandUpdateToAvatarsOverMe(); |
@@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
259 | 259 | ||
260 | public bool isBannedFromLand(UUID avatar) | 260 | public bool isBannedFromLand(UUID avatar) |
261 | { | 261 | { |
262 | if ((landData.Flags & (uint) Parcel.ParcelFlags.UseBanList) > 0) | 262 | if ((landData.Flags & (uint) ParcelFlags.UseBanList) > 0) |
263 | { | 263 | { |
264 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 264 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
265 | entry.AgentID = avatar; | 265 | entry.AgentID = avatar; |
@@ -276,7 +276,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
276 | 276 | ||
277 | public bool isRestrictedFromLand(UUID avatar) | 277 | public bool isRestrictedFromLand(UUID avatar) |
278 | { | 278 | { |
279 | if ((landData.Flags & (uint) Parcel.ParcelFlags.UseAccessList) > 0) | 279 | if ((landData.Flags & (uint) ParcelFlags.UseAccessList) > 0) |
280 | { | 280 | { |
281 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); | 281 | ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); |
282 | entry.AgentID = avatar; | 282 | entry.AgentID = avatar; |
@@ -318,7 +318,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
318 | { | 318 | { |
319 | if (over.landData.LocalID == landData.LocalID) | 319 | if (over.landData.LocalID == landData.LocalID) |
320 | { | 320 | { |
321 | if (((over.landData.Flags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) && m_scene.RegionInfo.RegionSettings.AllowDamage) | 321 | if (((over.landData.Flags & (uint)ParcelFlags.AllowDamage) != 0) && m_scene.RegionInfo.RegionSettings.AllowDamage) |
322 | avatars[i].Invulnerable = false; | 322 | avatars[i].Invulnerable = false; |
323 | else | 323 | else |
324 | avatars[i].Invulnerable = true; | 324 | avatars[i].Invulnerable = true; |