diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 1e003f7..f0d8335 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -111,10 +111,6 @@ namespace OpenSim.Framework | |||
111 | SetDefaultParams(); | 111 | SetDefaultParams(); |
112 | SetHeight(); | 112 | SetHeight(); |
113 | 113 | ||
114 | m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES]; | ||
115 | for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ ) | ||
116 | m_wearables[i] = new AvatarWearable(); | ||
117 | |||
118 | m_attachments = new Dictionary<int, List<AvatarAttachment>>(); | 114 | m_attachments = new Dictionary<int, List<AvatarAttachment>>(); |
119 | } | 115 | } |
120 | 116 | ||
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); |