aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2015-12-21 13:52:45 +0000
committerUbitUmarov2015-12-21 13:52:45 +0000
commit0e99763e6be5d955fa6dec5c9be2e83cd29ddcc3 (patch)
tree0b5918a51fe99a9ca577bde3a0b00c0d10e2c187 /OpenSim/Region
parentsimplify avatar updates throotle control, this possible needs to get more com... (diff)
downloadopensim-SC-0e99763e6be5d955fa6dec5c9be2e83cd29ddcc3.zip
opensim-SC-0e99763e6be5d955fa6dec5c9be2e83cd29ddcc3.tar.gz
opensim-SC-0e99763e6be5d955fa6dec5c9be2e83cd29ddcc3.tar.bz2
opensim-SC-0e99763e6be5d955fa6dec5c9be2e83cd29ddcc3.tar.xz
revert the setting of phantom flag on attachment drop to ground, since it can break nomod objects
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs7
1 files changed, 0 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index ca54138..ad889cb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -737,13 +737,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
737 } 737 }
738 738
739 rootPart.RemFlag(PrimFlags.TemporaryOnRez); 739 rootPart.RemFlag(PrimFlags.TemporaryOnRez);
740
741 // not physical, not temporary, phaton, not volume detector
742 // so.UpdatePrimFlags(rootPart.LocalId,false,false,true,rootPart.VolumeDetectActive);
743
744 // but do avoid nasty collisions set it phantom in this drop case
745 // until a better way is found
746 rootPart.AddFlag(PrimFlags.Phantom);
747 740
748 so.ApplyPhysics(); 741 so.ApplyPhysics();
749 742