diff options
| author | Melanie Thielker | 2008-10-11 23:59:46 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-10-11 23:59:46 +0000 |
| commit | acce65457cdff0641a0605aa0c5f3b6c37617107 (patch) | |
| tree | fac31ba9a0ba413c153588c9c78f75a63f4d0453 /OpenSim/Region/Environment | |
| parent | Fix llSetPos to handle child prims correctly. This will fix linked (diff) | |
| download | opensim-SC-acce65457cdff0641a0605aa0c5f3b6c37617107.zip opensim-SC-acce65457cdff0641a0605aa0c5f3b6c37617107.tar.gz opensim-SC-acce65457cdff0641a0605aa0c5f3b6c37617107.tar.bz2 opensim-SC-acce65457cdff0641a0605aa0c5f3b6c37617107.tar.xz | |
Fix the fix. Child prims were failing to load.
Diffstat (limited to 'OpenSim/Region/Environment')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index f47e4d7..27601d2 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
| @@ -551,15 +551,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 551 | //} | 551 | //} |
| 552 | //m_log.Info("[PART]: OFFSET:" + m_offsetPosition.ToString()); | 552 | //m_log.Info("[PART]: OFFSET:" + m_offsetPosition.ToString()); |
| 553 | 553 | ||
| 554 | if (_parentID != 0) | 554 | if (ParentGroup != null && ParentGroup.RootPart != null) |
| 555 | { | 555 | { |
| 556 | Vector3 resultingposition = GetWorldPosition(); | 556 | if (_parentID != 0) |
| 557 | PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z); | 557 | { |
| 558 | Quaternion resultingrot = GetWorldRotation(); | 558 | Vector3 resultingposition = GetWorldPosition(); |
| 559 | PhysActor.Orientation = resultingrot; | 559 | PhysActor.Position = new PhysicsVector(resultingposition.X, resultingposition.Y, resultingposition.Z); |
| 560 | Quaternion resultingrot = GetWorldRotation(); | ||
| 561 | PhysActor.Orientation = resultingrot; | ||
| 560 | 562 | ||
| 561 | // Tell the physics engines that this prim changed. | 563 | // Tell the physics engines that this prim changed. |
| 562 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); | 564 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); |
| 565 | } | ||
| 563 | } | 566 | } |
| 564 | } | 567 | } |
| 565 | } | 568 | } |