diff options
author | CasperW | 2009-12-21 13:29:48 +0100 |
---|---|---|
committer | CasperW | 2009-12-21 13:29:48 +0100 |
commit | d8d6e8a30415197eb55c59172abfb890ec7a46bd (patch) | |
tree | db937d6c6e3816932781e7be90c318408d117a78 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Fixed a nasty crash in StandUp() that occurred when the part got killed with ... (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.zip opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.gz opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.bz2 opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.xz |
Merge branch 'master' into casper
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index abdd1a0..a3ad7ca 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
129 | private Vector3? m_forceToApply; | 129 | private Vector3? m_forceToApply; |
130 | private uint m_requestedSitTargetID; | 130 | private uint m_requestedSitTargetID; |
131 | private UUID m_requestedSitTargetUUID; | 131 | private UUID m_requestedSitTargetUUID; |
132 | private Vector3 m_requestedSitOffset; | 132 | |
133 | private SendCourseLocationsMethod m_sendCourseLocationsMethod; | 133 | private SendCourseLocationsMethod m_sendCourseLocationsMethod; |
134 | 134 | ||
135 | private bool m_startAnimationSet; | 135 | private bool m_startAnimationSet; |
@@ -1926,7 +1926,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1926 | m_nextSitAnimation = part.SitAnimation; | 1926 | m_nextSitAnimation = part.SitAnimation; |
1927 | } | 1927 | } |
1928 | m_requestedSitTargetID = part.LocalId; | 1928 | m_requestedSitTargetID = part.LocalId; |
1929 | m_requestedSitOffset = offset; | 1929 | //m_requestedSitOffset = offset; |
1930 | m_requestedSitTargetUUID = targetID; | 1930 | m_requestedSitTargetUUID = targetID; |
1931 | 1931 | ||
1932 | m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); | 1932 | m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); |
@@ -2159,7 +2159,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2159 | if (part != null) | 2159 | if (part != null) |
2160 | { | 2160 | { |
2161 | m_requestedSitTargetID = part.LocalId; | 2161 | m_requestedSitTargetID = part.LocalId; |
2162 | m_requestedSitOffset = offset; | 2162 | //m_requestedSitOffset = offset; |
2163 | m_requestedSitTargetUUID = targetID; | 2163 | m_requestedSitTargetUUID = targetID; |
2164 | 2164 | ||
2165 | m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); | 2165 | m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset); |