Merge fixes, and fix the build

This commit is contained in:
Tom
2011-09-14 18:46:42 -07:00
parent 03f6734f43
commit cda4cd6b55
10 changed files with 184 additions and 354 deletions

View File

@@ -3243,6 +3243,14 @@ namespace OpenSim.Region.Framework.Scenes
STATUS_ROTATE_Z = rotate;
}
public void SetBuoyancy(float fvalue)
{
if (PhysActor != null)
{
PhysActor.Buoyancy = fvalue;
}
}
public void SetDieAtEdge(bool p)
{
if (m_parentGroup.IsDeleted)