diff options
| author | UbitUmarov | 2017-05-20 14:30:49 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-20 14:30:49 +0100 |
| commit | 78c4f8000edeb39e7c32b68d7a4a529dc06db980 (patch) | |
| tree | 1630fcc27f3ecb145ec45f945a283647acdca4dd /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | mantis 8170: let physics know Always_run on adding the avatar (diff) | |
| download | opensim-SC-78c4f8000edeb39e7c32b68d7a4a529dc06db980.zip opensim-SC-78c4f8000edeb39e7c32b68d7a4a529dc06db980.tar.gz opensim-SC-78c4f8000edeb39e7c32b68d7a4a529dc06db980.tar.bz2 opensim-SC-78c4f8000edeb39e7c32b68d7a4a529dc06db980.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 805c9ad..2731274 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -4880,6 +4880,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4880 | PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong | 4880 | PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong |
| 4881 | PhysicsActor.SubscribeEvents(100); | 4881 | PhysicsActor.SubscribeEvents(100); |
| 4882 | PhysicsActor.LocalID = LocalId; | 4882 | PhysicsActor.LocalID = LocalId; |
| 4883 | PhysicsActor.SetAlwaysRun = m_setAlwaysRun; | ||
| 4883 | } | 4884 | } |
| 4884 | 4885 | ||
| 4885 | private void OutOfBoundsCall(Vector3 pos) | 4886 | private void OutOfBoundsCall(Vector3 pos) |