From b596a36369f5f5ac1a85793069e3a8cf03ae22cb Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 11 Jan 2021 12:18:07 +0000 Subject: [PATCH] fix previus commit, not storing script related flags on dbs like all 0.9.x. this must be regen on scripts rez --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c5c5c74899..0e829a1b85 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -493,6 +493,7 @@ namespace OpenSim.Region.Framework.Scenes private uint _everyoneMask = (uint)PermissionMask.None; private uint _nextOwnerMask = (uint)(PermissionMask.Move | PermissionMask.Transfer); private PrimFlags m_flags = PrimFlags.None; + private PrimFlags m_localFlags = PrimFlags.None; private DateTime m_expires; private DateTime m_rezzed; private bool m_createSelected = false; @@ -2501,7 +2502,7 @@ namespace OpenSim.Region.Framework.Scenes public uint GetEffectiveObjectFlags() { - uint eff = (uint)m_flags; + uint eff = (uint)(m_flags | m_localFlags); if(m_inventory == null || m_inventory.Count == 0) eff |= (uint)PrimFlags.InventoryEmpty; return eff; @@ -5333,8 +5334,7 @@ namespace OpenSim.Region.Framework.Scenes objectflagupdate |= (uint) PrimFlags.AllowInventoryDrop; } - m_flags &= ~(PrimFlags.Touch | PrimFlags.Money | PrimFlags.AllowInventoryDrop); - m_flags |= (PrimFlags)objectflagupdate; + m_localFlags |= (PrimFlags)objectflagupdate; if (ParentGroup != null && ParentGroup.RootPart == this) {