From 8eb9bc8b1999c3cf68d7695d6efe067bed289671 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 8 Nov 2017 06:51:55 +0000 Subject: [PATCH] mantis 8263: recover the ignore of texture changes if only materialID changed. That should be done by respective cap (as before) --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 350b9cf4c2..532263a658 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -2583,6 +2583,7 @@ namespace OpenSim.Region.Framework.Scenes if(ParentGroup != null) ParentGroup.InvalidateEffectivePerms(); } + // same as above but called during group Effective Permission validation public void AggregatedInnerPermsForGroup() { @@ -5227,9 +5228,10 @@ namespace OpenSim.Region.Framework.Scenes } } + if (changeFlags == 0) + return; m_shape.TextureEntry = newTex.GetBytes(); - if (changeFlags != 0) - TriggerScriptChangedEvent(changeFlags); + TriggerScriptChangedEvent(changeFlags); ParentGroup.HasGroupChanged = true; ScheduleFullUpdate(); }