Merge branch 'master' into mantis5110

This commit is contained in:
Jonathan Freedman
2010-10-30 14:11:02 -04:00
9 changed files with 18681 additions and 18685 deletions

View File

@@ -355,7 +355,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
if (renderMesh == null)
return;
warp_Vector primPos = ConvertVector(prim.AbsolutePosition);
warp_Vector primPos = ConvertVector(prim.GetWorldPosition());
warp_Quaternion primRot = ConvertQuaternion(prim.RotationOffset);
warp_Matrix m = warp_Matrix.quaternionMatrix(primRot);