aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2016-08-17 23:33:11 +0100
committerUbitUmarov2016-08-17 23:33:11 +0100
commit7d968213fdae2548675833bc42e4863f8967e3cc (patch)
tree86b8d0cb8b887e852c2690d4343876246f961310 /OpenSim/Region
parentubOde reduce collision_start latency in same cases (only one collision happen... (diff)
downloadopensim-SC_OLD-7d968213fdae2548675833bc42e4863f8967e3cc.zip
opensim-SC_OLD-7d968213fdae2548675833bc42e4863f8967e3cc.tar.gz
opensim-SC_OLD-7d968213fdae2548675833bc42e4863f8967e3cc.tar.bz2
opensim-SC_OLD-7d968213fdae2548675833bc42e4863f8967e3cc.tar.xz
fix region Allow damage and parcel safe flags handling
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index b00f2b0..69a3455 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -374,9 +374,10 @@ namespace OpenSim.Region.CoreModules.World.Land
374 374
375 public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) 375 public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
376 { 376 {
377 remote_client.SceneAgent.Invulnerable = 377 if(m_scene.RegionInfo.RegionSettings.AllowDamage)
378 !m_scene.RegionInfo.RegionSettings.AllowDamage || 378 remote_client.SceneAgent.Invulnerable = false;
379 (m_landData.Flags & (uint)ParcelFlags.AllowDamage) == 0; 379 else
380 remote_client.SceneAgent.Invulnerable = (m_landData.Flags & (uint)ParcelFlags.AllowDamage) == 0;
380 381
381 if (remote_client.SceneAgent.PresenceType == PresenceType.Npc) 382 if (remote_client.SceneAgent.PresenceType == PresenceType.Npc)
382 return; 383 return;
@@ -779,11 +780,10 @@ namespace OpenSim.Region.CoreModules.World.Land
779 { 780 {
780 if (over.LandData.LocalID == LandData.LocalID) 781 if (over.LandData.LocalID == LandData.LocalID)
781 { 782 {
782 if (((over.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) && 783 if(m_scene.RegionInfo.RegionSettings.AllowDamage)
783 m_scene.RegionInfo.RegionSettings.AllowDamage)
784 avatar.Invulnerable = false; 784 avatar.Invulnerable = false;
785 else 785 else
786 avatar.Invulnerable = true; 786 avatar.Invulnerable = (over.LandData.Flags & (uint)ParcelFlags.AllowDamage) == 0;
787 787
788 SendLandUpdateToClient(snap_selection, avatar.ControllingClient); 788 SendLandUpdateToClient(snap_selection, avatar.ControllingClient);
789 avatar.currentParcelUUID = LandData.GlobalID; 789 avatar.currentParcelUUID = LandData.GlobalID;