Merge branch 'master' into mantis5110

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
             SetDefaultParams();
             SetHeight();
             
-            m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
-            for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ )
-                m_wearables[i] = new AvatarWearable();
-
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
         }
         
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
             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);