diff options
| author | Melanie | 2012-02-19 20:08:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-19 20:08:01 +0100 |
| commit | 96409cc2eeb4555609f72c8bc61fbdf4ac3e9933 (patch) | |
| tree | 394a7a07ff913c8efa390399c190d5c65bf8f95b /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| parent | moved vehicle from SOG to SOP (diff) | |
| download | opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.zip opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.gz opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.bz2 opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.xz | |
Merge branch 'ubitwork'
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 |
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 5ca2ce4..c5cec59 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 417 | so.AttachedAvatar = UUID.Zero; | 417 | so.AttachedAvatar = UUID.Zero; |
| 418 | rootPart.SetParentLocalId(0); | 418 | rootPart.SetParentLocalId(0); |
| 419 | so.ClearPartAttachmentData(); | 419 | so.ClearPartAttachmentData(); |
| 420 | rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive); | 420 | rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false); |
| 421 | so.HasGroupChanged = true; | 421 | so.HasGroupChanged = true; |
| 422 | rootPart.Rezzed = DateTime.Now; | 422 | rootPart.Rezzed = DateTime.Now; |
| 423 | rootPart.RemFlag(PrimFlags.TemporaryOnRez); | 423 | rootPart.RemFlag(PrimFlags.TemporaryOnRez); |