aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2009-12-20 16:45:28 +0000
committerMelanie2009-12-20 16:45:28 +0000
commit3d3e0ea4f38b343edc19b7530fbac28b84b53ecf (patch)
treeb22a6e71dca45c15f98df996182239186259b6d3 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'casper' (diff)
parentFix a case where an idle sim can eat 100% of a core (diff)
downloadopensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.zip
opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.gz
opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.bz2
opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 865f649..cbd169a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes
128 private Vector3? m_forceToApply; 128 private Vector3? m_forceToApply;
129 private uint m_requestedSitTargetID; 129 private uint m_requestedSitTargetID;
130 private UUID m_requestedSitTargetUUID; 130 private UUID m_requestedSitTargetUUID;
131 private Vector3 m_requestedSitOffset; 131
132 private SendCourseLocationsMethod m_sendCourseLocationsMethod; 132 private SendCourseLocationsMethod m_sendCourseLocationsMethod;
133 133
134 private bool m_startAnimationSet; 134 private bool m_startAnimationSet;
@@ -1898,7 +1898,7 @@ namespace OpenSim.Region.Framework.Scenes
1898 m_nextSitAnimation = part.SitAnimation; 1898 m_nextSitAnimation = part.SitAnimation;
1899 } 1899 }
1900 m_requestedSitTargetID = part.LocalId; 1900 m_requestedSitTargetID = part.LocalId;
1901 m_requestedSitOffset = offset; 1901 //m_requestedSitOffset = offset;
1902 m_requestedSitTargetUUID = targetID; 1902 m_requestedSitTargetUUID = targetID;
1903 1903
1904 m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); 1904 m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
@@ -2131,7 +2131,7 @@ namespace OpenSim.Region.Framework.Scenes
2131 if (part != null) 2131 if (part != null)
2132 { 2132 {
2133 m_requestedSitTargetID = part.LocalId; 2133 m_requestedSitTargetID = part.LocalId;
2134 m_requestedSitOffset = offset; 2134 //m_requestedSitOffset = offset;
2135 m_requestedSitTargetUUID = targetID; 2135 m_requestedSitTargetUUID = targetID;
2136 2136
2137 m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); 2137 m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);