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

ubitode prim select was not doing phantom case

avinationmerge
UbitUmarov 2012-03-12 07:46:20 +00:00
parent 6c4c500ee4
commit b5e172677d
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
View File

@ -2487,14 +2487,25 @@ namespace OpenSim.Region.Physics.OdePlugin
if (!childPrim && Body != IntPtr.Zero && !m_disabled) if (!childPrim && Body != IntPtr.Zero && !m_disabled)
d.BodyEnable(Body); d.BodyEnable(Body);
m_collisionCategories = CollisionCategories.Geom; if (m_isphantom && !m_isVolumeDetect)
if (m_isphysical) {
m_collisionCategories |= CollisionCategories.Body; m_collisionCategories = 0;
if(m_isphysical)
m_collisionFlags = CollisionCategories.Land;
else
m_collisionFlags = 0;
}
else
{
m_collisionCategories = CollisionCategories.Geom;
if (m_isphysical)
m_collisionCategories |= CollisionCategories.Body;
m_collisionFlags = m_default_collisionFlags | CollisionCategories.Land; m_collisionFlags = m_default_collisionFlags | CollisionCategories.Land;
if (m_collidesWater) if (m_collidesWater)
m_collisionFlags |= CollisionCategories.Water; m_collisionFlags |= CollisionCategories.Water;
}
if (!childPrim) if (!childPrim)
{ {