Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge

author: Melanie 2011-10-25 01:54:07 +0100
committer: Melanie 2011-10-25 01:54:07 +0100
commit: 3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba (patch)
tree: ff4233adbe9c2d00787a52c79e90c448e0aa7172 /OpenSim/Region/CoreModules/Avatar
parent: Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge (diff)
parent: remove now redundant m_physical_prim flag from SOP.ApplyPhysics() (diff)
download: opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.zip
opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.tar.gz
opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.tar.bz2
opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 96766f3..f8681e7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                so.AttachedAvatar = UUID.Zero;
                rootPart.SetParentLocalId(0);
                so.ClearPartAttachmentData();
-                rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive, m_scene.m_physicalPrim);
+                rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive);
                so.HasGroupChanged = true;
                rootPart.Rezzed = DateTime.Now;
                rootPart.RemFlag(PrimFlags.TemporaryOnRez);
author	Melanie	2011-10-25 01:54:07 +0100
committer	Melanie	2011-10-25 01:54:07 +0100
commit	3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba (patch)
tree	ff4233adbe9c2d00787a52c79e90c448e0aa7172 /OpenSim/Region/CoreModules/Avatar
parent	Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge (diff)
parent	remove now redundant m_physical_prim flag from SOP.ApplyPhysics() (diff)
download	opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.zip opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.tar.gz opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.tar.bz2 opensim-SC_OLD-3cdea11e292ed2bc2e350ca513f95d7c70ccd6ba.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 96766f3..f8681e7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
373	so.AttachedAvatar = UUID.Zero;	373	so.AttachedAvatar = UUID.Zero;
374	rootPart.SetParentLocalId(0);	374	rootPart.SetParentLocalId(0);
375	so.ClearPartAttachmentData();	375	so.ClearPartAttachmentData();
376	rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive, m_scene.m_physicalPrim);	376	rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive);
377	so.HasGroupChanged = true;	377	so.HasGroupChanged = true;
378	rootPart.Rezzed = DateTime.Now;	378	rootPart.Rezzed = DateTime.Now;
379	rootPart.RemFlag(PrimFlags.TemporaryOnRez);	379	rootPart.RemFlag(PrimFlags.TemporaryOnRez);