diff options
| author | Melanie | 2009-10-22 17:39:19 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-22 17:39:19 +0100 |
| commit | fc4ff09181e1a2a9cecf1557795dce3f783966f0 (patch) | |
| tree | dfc24cf5688eef7e5baff2e21359d0e1ed6a574c /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Fixing the patch to the patch (diff) | |
| parent | Merge branch 'master' into vehicles (diff) | |
| download | opensim-SC-fc4ff09181e1a2a9cecf1557795dce3f783966f0.zip opensim-SC-fc4ff09181e1a2a9cecf1557795dce3f783966f0.tar.gz opensim-SC-fc4ff09181e1a2a9cecf1557795dce3f783966f0.tar.bz2 opensim-SC-fc4ff09181e1a2a9cecf1557795dce3f783966f0.tar.xz | |
Merge branch 'vehicles'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index c2b9e73..4d76b4ef 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2271,7 +2271,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2271 | group.ClearPartAttachmentData(); | 2271 | group.ClearPartAttachmentData(); |
| 2272 | } | 2272 | } |
| 2273 | 2273 | ||
| 2274 | group.UpdateGroupRotation(rot); | 2274 | group.UpdateGroupRotationR(rot); |
| 2275 | 2275 | ||
| 2276 | //group.ApplyPhysics(m_physicalPrim); | 2276 | //group.ApplyPhysics(m_physicalPrim); |
| 2277 | if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero) | 2277 | if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero) |