aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-07-24 19:31:28 +0100
committerUbitUmarov2016-07-24 19:31:28 +0100
commitd6d3e14f291d3217d1727dfb9ddfe2420c9a0a42 (patch)
tree9526aed75464bb975fe6bf84015cea2dec6bae12
parent add osSetHealth() value from 1 to 100; (mantis 7973) (diff)
downloadopensim-SC_OLD-d6d3e14f291d3217d1727dfb9ddfe2420c9a0a42.zip
opensim-SC_OLD-d6d3e14f291d3217d1727dfb9ddfe2420c9a0a42.tar.gz
opensim-SC_OLD-d6d3e14f291d3217d1727dfb9ddfe2420c9a0a42.tar.bz2
opensim-SC_OLD-d6d3e14f291d3217d1727dfb9ddfe2420c9a0a42.tar.xz
add a missing update to avatar damage Invulnerable
-rw-r--r--OpenSim/Framework/ISceneAgent.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs4
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs
index be11931..1848b17 100644
--- a/OpenSim/Framework/ISceneAgent.cs
+++ b/OpenSim/Framework/ISceneAgent.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Framework
55 /// </summary> 55 /// </summary>
56 bool IsChildAgent { get; } 56 bool IsChildAgent { get; }
57 57
58 bool Invulnerable { get; set; }
58 /// <summary> 59 /// <summary>
59 /// Avatar appearance data. 60 /// Avatar appearance data.
60 /// </summary> 61 /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 4cea7bb..b00f2b0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -374,6 +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 =
378 !m_scene.RegionInfo.RegionSettings.AllowDamage ||
379 (m_landData.Flags & (uint)ParcelFlags.AllowDamage) == 0;
380
377 if (remote_client.SceneAgent.PresenceType == PresenceType.Npc) 381 if (remote_client.SceneAgent.PresenceType == PresenceType.Npc)
378 return; 382 return;
379 383