diff options
| author | Jonathan Freedman | 2010-10-30 14:11:02 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-30 14:11:02 -0400 |
| commit | 96a29c43b0b5f297f1ca573ce81509bd0c3b2210 (patch) | |
| tree | 9b2f091b88741ca28c3c12a52034fbd9f7212df8 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | * AbsolutePosition.Get{} returns incorrect result for child prim so switch to... (diff) | |
| download | opensim-SC-96a29c43b0b5f297f1ca573ce81509bd0c3b2210.zip opensim-SC-96a29c43b0b5f297f1ca573ce81509bd0c3b2210.tar.gz opensim-SC-96a29c43b0b5f297f1ca573ce81509bd0c3b2210.tar.bz2 opensim-SC-96a29c43b0b5f297f1ca573ce81509bd0c3b2210.tar.xz | |
Merge branch 'master' into mantis5110
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs index 00b506e..6eb57eb 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs | |||
| @@ -355,7 +355,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
| 355 | if (renderMesh == null) | 355 | if (renderMesh == null) |
| 356 | return; | 356 | return; |
| 357 | 357 | ||
| 358 | warp_Vector primPos = ConvertVector(prim.AbsolutePosition); | 358 | warp_Vector primPos = ConvertVector(prim.GetWorldPosition()); |
| 359 | warp_Quaternion primRot = ConvertQuaternion(prim.RotationOffset); | 359 | warp_Quaternion primRot = ConvertQuaternion(prim.RotationOffset); |
| 360 | 360 | ||
| 361 | warp_Matrix m = warp_Matrix.quaternionMatrix(primRot); | 361 | warp_Matrix m = warp_Matrix.quaternionMatrix(primRot); |