diff options
author | Melanie | 2012-12-03 19:46:16 +0100 |
---|---|---|
committer | Melanie | 2012-12-03 19:46:16 +0100 |
commit | b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef (patch) | |
tree | ade7248fe85aa3c1f5702aa767809dd6e95dc6c3 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Merge branch 'avination' into ubitwork (diff) | |
parent | *TEST* diferent avatar collider (diff) | |
download | opensim-SC_OLD-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.zip opensim-SC_OLD-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.tar.gz opensim-SC_OLD-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.tar.bz2 opensim-SC_OLD-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.tar.xz |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7f07d73..bacc9c9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -571,7 +571,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
571 | set | 571 | set |
572 | { | 572 | { |
573 | m_bodyRot = value; | 573 | m_bodyRot = value; |
574 | // m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot); | 574 | // m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot); |
575 | if (PhysicsActor != null) | ||
576 | { | ||
577 | try | ||
578 | { | ||
579 | PhysicsActor.Orientation = value; | ||
580 | } | ||
581 | catch (Exception e) | ||
582 | { | ||
583 | m_log.Error("[SCENE PRESENCE]: Orientation " + e.Message); | ||
584 | } | ||
585 | } | ||
575 | } | 586 | } |
576 | } | 587 | } |
577 | 588 | ||
@@ -3435,7 +3446,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3435 | 3446 | ||
3436 | PhysicsActor = scene.AddAvatar( | 3447 | PhysicsActor = scene.AddAvatar( |
3437 | LocalId, Firstname + "." + Lastname, pVec, | 3448 | LocalId, Firstname + "." + Lastname, pVec, |
3438 | new Vector3(0f, 0f, Appearance.AvatarHeight), isFlying); | 3449 | new Vector3(0.45f, 0.6f, Appearance.AvatarHeight), isFlying); |
3439 | 3450 | ||
3440 | //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; | 3451 | //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; |
3441 | PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; | 3452 | PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; |