OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add a missing update to avatar damage Invulnerable

LSLKeyTest
UbitUmarov 2016-07-24 19:31:28 +01:00
parent 2bb467e358
commit d6d3e14f29
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/ISceneAgent.cs
View File

@ -55,6 +55,7 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
bool IsChildAgent { get; } bool IsChildAgent { get; }
bool Invulnerable { get; set; }
/// <summary> /// <summary>
/// Avatar appearance data. /// Avatar appearance data.
/// </summary> /// </summary>

4
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -374,6 +374,10 @@ namespace OpenSim.Region.CoreModules.World.Land
public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client) public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
{ {
remote_client.SceneAgent.Invulnerable =
!m_scene.RegionInfo.RegionSettings.AllowDamage ||
(m_landData.Flags & (uint)ParcelFlags.AllowDamage) == 0;
if (remote_client.SceneAgent.PresenceType == PresenceType.Npc) if (remote_client.SceneAgent.PresenceType == PresenceType.Npc)
return; return;