From d0895a4a3ae8a60764db4ada43c194fddc90ddf4 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sat, 30 Oct 2010 03:28:59 +0100 Subject: On first login, Ruth is back now. Strangely, inventory items are created for tattoo and alpha layers. Any change of appearance in the sim makes the green gnome reappear on next login. Progress of sorts. --- OpenSim/Framework/AvatarAppearance.cs | 4 ---- 1 file changed, 4 deletions(-) (limited to 'OpenSim') 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>(); } -- cgit v1.1 From 09bf9d5fca8e9c22f3a0f5660aa55eea316853b1 Mon Sep 17 00:00:00 2001 From: Teravus Ovares (Dan Olivares) Date: Sat, 30 Oct 2010 02:26:48 -0400 Subject: * AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer. --- OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim') 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); -- cgit v1.1