diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index bac0427..5353c75 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -141,7 +141,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 141 | 141 | ||
| 142 | // It can be confusing for an actor to know if it should move or update an object | 142 | // It can be confusing for an actor to know if it should move or update an object |
| 143 | // depeneding on the setting of 'selected', 'physical, ... | 143 | // depeneding on the setting of 'selected', 'physical, ... |
| 144 | // This flag is the true test -- if true, the object is being acted on in the physical world | 144 | // This flag is the true test -- if true, the object is being acted on in the physical world |
| 145 | public abstract bool IsPhysicallyActive { get; } | 145 | public abstract bool IsPhysicallyActive { get; } |
| 146 | 146 | ||
| 147 | // Materialness | 147 | // Materialness |