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

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

@ -1494,8 +1494,6 @@ 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
@ -1513,10 +1511,7 @@ Console.WriteLine("changeadd 1");
} }
if (IsPhysical && Body == IntPtr.Zero) if (IsPhysical && Body == IntPtr.Zero)
{
enableBody(); enableBody();
}
}
changeSelectedStatus(); changeSelectedStatus();