Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-03 21:43:39 +00:00
56 changed files with 1095 additions and 838 deletions

View File

@@ -622,22 +622,22 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
public override Quaternion APIDTarget
{
set { return; }
set { return; }
}
public override bool APIDActive
{
set { return; }
set { return; }
}
public override float APIDStrength
{
set { return; }
set { return; }
}
public override float APIDDamping
{
set { return; }
set { return; }
}
/// <summary>