OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge

avinationmerge
Melanie 2011-10-25 02:55:19 +01:00
parent 43751d0cfd f10a824e47
commit 2134f23da0
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -1494,30 +1494,25 @@ Console.WriteLine("CreateGeom:");
// m_log.Debug(m_localID); // m_log.Debug(m_localID);
} }
lock (_parent_scene.OdeLock)
{
#if SPAM #if SPAM
Console.WriteLine("changeadd 1"); Console.WriteLine("changeadd 1");
#endif #endif
CreateGeom(m_targetSpace, mesh); CreateGeom(m_targetSpace, mesh);
if (prim_geom != IntPtr.Zero) if (prim_geom != IntPtr.Zero)
{ {
d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
d.Quaternion myrot = new d.Quaternion(); d.Quaternion myrot = new d.Quaternion();
myrot.X = _orientation.X; myrot.X = _orientation.X;
myrot.Y = _orientation.Y; myrot.Y = _orientation.Y;
myrot.Z = _orientation.Z; myrot.Z = _orientation.Z;
myrot.W = _orientation.W; myrot.W = _orientation.W;
d.GeomSetQuaternion(prim_geom, ref myrot); d.GeomSetQuaternion(prim_geom, ref myrot);
}
if (IsPhysical && Body == IntPtr.Zero)
{
enableBody();
}
} }
if (IsPhysical && Body == IntPtr.Zero)
enableBody();
changeSelectedStatus(); changeSelectedStatus();
m_taintadd = false; m_taintadd = false;