diff options
author | UbitUmarov | 2017-11-08 06:51:55 +0000 |
---|---|---|
committer | UbitUmarov | 2017-11-08 06:51:55 +0000 |
commit | 8eb9bc8b1999c3cf68d7695d6efe067bed289671 (patch) | |
tree | 8748363cde4d517e764156cd92c73879f43cd656 /OpenSim/Region/Framework/Scenes | |
parent | remove a potencial (and silly) deadlock; let other texture parameters changes... (diff) | |
download | opensim-SC_OLD-8eb9bc8b1999c3cf68d7695d6efe067bed289671.zip opensim-SC_OLD-8eb9bc8b1999c3cf68d7695d6efe067bed289671.tar.gz opensim-SC_OLD-8eb9bc8b1999c3cf68d7695d6efe067bed289671.tar.bz2 opensim-SC_OLD-8eb9bc8b1999c3cf68d7695d6efe067bed289671.tar.xz |
mantis 8263: recover the ignore of texture changes if only materialID changed. That should be done by respective cap (as before)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 350b9cf..532263a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2583,6 +2583,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2583 | if(ParentGroup != null) | 2583 | if(ParentGroup != null) |
2584 | ParentGroup.InvalidateEffectivePerms(); | 2584 | ParentGroup.InvalidateEffectivePerms(); |
2585 | } | 2585 | } |
2586 | |||
2586 | // same as above but called during group Effective Permission validation | 2587 | // same as above but called during group Effective Permission validation |
2587 | public void AggregatedInnerPermsForGroup() | 2588 | public void AggregatedInnerPermsForGroup() |
2588 | { | 2589 | { |
@@ -5227,9 +5228,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
5227 | } | 5228 | } |
5228 | } | 5229 | } |
5229 | 5230 | ||
5231 | if (changeFlags == 0) | ||
5232 | return; | ||
5230 | m_shape.TextureEntry = newTex.GetBytes(); | 5233 | m_shape.TextureEntry = newTex.GetBytes(); |
5231 | if (changeFlags != 0) | 5234 | TriggerScriptChangedEvent(changeFlags); |
5232 | TriggerScriptChangedEvent(changeFlags); | ||
5233 | ParentGroup.HasGroupChanged = true; | 5235 | ParentGroup.HasGroupChanged = true; |
5234 | ScheduleFullUpdate(); | 5236 | ScheduleFullUpdate(); |
5235 | } | 5237 | } |