diff options
| author | John Hurliman | 2009-10-22 11:07:43 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-22 11:07:43 -0700 |
| commit | 11013ad2956a87a5641ee2245fe81e5f3dfec268 (patch) | |
| tree | 0a0a1cc7019c21e6083d80454228729d55e0ee40 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Terrible typo in the previous commit! (diff) | |
| parent | Correct version number after merge (diff) | |
| download | opensim-SC-11013ad2956a87a5641ee2245fe81e5f3dfec268.zip opensim-SC-11013ad2956a87a5641ee2245fe81e5f3dfec268.tar.gz opensim-SC-11013ad2956a87a5641ee2245fe81e5f3dfec268.tar.bz2 opensim-SC-11013ad2956a87a5641ee2245fe81e5f3dfec268.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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) |