ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mantis5110

Browse Source
This commit is contained in:
Jonathan Freedman
2010-10-30 14:11:02 -04:00
parent e371d3208c 09bf9d5fca
commit 96a29c43b0
9 changed files with 18681 additions and 18685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -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>>();
}

2
OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
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);