diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 20cae5d..265129c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1328,7 +1328,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1328 | maintc = Util.EnvironmentTickCountSubtract(maintc); | 1328 | maintc = Util.EnvironmentTickCountSubtract(maintc); |
1329 | maintc = (int)(m_timespan * 1000) - maintc; | 1329 | maintc = (int)(m_timespan * 1000) - maintc; |
1330 | 1330 | ||
1331 | if ((maintc < (m_timespan * 1000)) && maintc > 0) | 1331 | if (maintc > 0) |
1332 | Thread.Sleep(maintc); | 1332 | Thread.Sleep(maintc); |
1333 | 1333 | ||
1334 | // Tell the watchdog that this thread is still alive | 1334 | // Tell the watchdog that this thread is still alive |
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); |