aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b95d613..bd94902 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -345,7 +345,10 @@ namespace OpenSim.Region.Framework.Scenes
345 } 345 }
346 346
347 #region Client Camera 347 #region Client Camera
348 // Position of agent's camera in world (region cordinates) 348
349 /// <summary>
350 /// Position of agent's camera in world (region cordinates)
351 /// </summary>
349 protected Vector3 m_lastCameraPosition; 352 protected Vector3 m_lastCameraPosition;
350 353
351 protected Vector3 m_CameraPosition; 354 protected Vector3 m_CameraPosition;
@@ -2082,12 +2085,12 @@ namespace OpenSim.Region.Framework.Scenes
2082 foreach (SceneObjectPart part in partArray) 2085 foreach (SceneObjectPart part in partArray)
2083 { 2086 {
2084 // Is a sit target available? 2087 // Is a sit target available?
2085 Vector3 avSitOffSet = part.SitTargetPosition; 2088 Vector3 avSitOffset = part.SitTargetPosition;
2086 Quaternion avSitOrientation = part.SitTargetOrientation; 2089 Quaternion avSitOrientation = part.SitTargetOrientation;
2087 UUID avOnTargetAlready = part.SitTargetAvatar; 2090 UUID avOnTargetAlready = part.SitTargetAvatar;
2088 2091
2089 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); 2092 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero));
2090 bool SitTargetisSet = (Vector3.Zero != avSitOffSet); //NB Latest SL Spec shows Sit Rotation setting is ignored. 2093 bool SitTargetisSet = (Vector3.Zero != avSitOffset); //NB Latest SL Spec shows Sit Rotation setting is ignored.
2091 2094
2092 if (SitTargetisSet && SitTargetUnOccupied) 2095 if (SitTargetisSet && SitTargetUnOccupied)
2093 { 2096 {
@@ -2110,7 +2113,6 @@ namespace OpenSim.Region.Framework.Scenes
2110 Vector3 cameraAtOffset = Vector3.Zero; 2113 Vector3 cameraAtOffset = Vector3.Zero;
2111 bool forceMouselook = false; 2114 bool forceMouselook = false;
2112 2115
2113 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
2114 SceneObjectPart part = FindNextAvailableSitTarget(targetID); 2116 SceneObjectPart part = FindNextAvailableSitTarget(targetID);
2115 if (part == null) return; 2117 if (part == null) return;
2116 2118
@@ -2596,6 +2598,7 @@ namespace OpenSim.Region.Framework.Scenes
2596 return; 2598 return;
2597 } 2599 }
2598 } 2600 }
2601
2599 ParentID = m_requestedSitTargetID; 2602 ParentID = m_requestedSitTargetID;
2600 2603
2601 //We want our offsets to reference the root prim, not the child we may have sat on 2604 //We want our offsets to reference the root prim, not the child we may have sat on
@@ -2794,9 +2797,6 @@ namespace OpenSim.Region.Framework.Scenes
2794 // server. 2797 // server.
2795 if (remoteClient.IsActive) 2798 if (remoteClient.IsActive)
2796 { 2799 {
2797 Vector3 pos = m_pos;
2798 pos.Z += Appearance.HipOffset;
2799
2800 //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity); 2800 //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity);
2801 2801
2802 remoteClient.SendEntityUpdate( 2802 remoteClient.SendEntityUpdate(