ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2011-12-22 16:37:25 +00:00
parent ca6113a4d5 219ec7ef20
commit b970d4f976
13 changed files with 153 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Physics/Manager/PhysicsActor.cs
View File

@@ -261,7 +261,7 @@ namespace OpenSim.Region.Physics.Manager
public abstract Vector3 Torque { get; set; }
public abstract float CollisionScore { get; set;}
public abstract Vector3 Acceleration { get; }
public abstract Vector3 Acceleration { get; set; }
public abstract Quaternion Orientation { get; set; }
public abstract int PhysicsActorType { get; set; }
public abstract bool IsPhysical { get; set; }
@@ -458,6 +458,7 @@ namespace OpenSim.Region.Physics.Manager
public override Vector3 Acceleration
{
get { return Vector3.Zero; }
set { }
}
public override bool IsPhysical