diff options
author | UbitUmarov | 2015-08-31 14:21:50 +0100 |
---|---|---|
committer | UbitUmarov | 2015-08-31 14:21:50 +0100 |
commit | 31a50a73cbd80829f75c293087472b4ce9d6abc8 (patch) | |
tree | fd911654c9f98a46b7b9d168af27506d39f4c9cb /OpenSim/Region/Framework/Scenes | |
parent | start sending terrain patchs in completmovement where we know its (diff) | |
download | opensim-SC_OLD-31a50a73cbd80829f75c293087472b4ce9d6abc8.zip opensim-SC_OLD-31a50a73cbd80829f75c293087472b4ce9d6abc8.tar.gz opensim-SC_OLD-31a50a73cbd80829f75c293087472b4ce9d6abc8.tar.bz2 opensim-SC_OLD-31a50a73cbd80829f75c293087472b4ce9d6abc8.tar.xz |
dont change camera on crossings
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index cd5525c..6390d26 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1198,9 +1198,6 @@ no information to check this | |||
1198 | } | 1198 | } |
1199 | AbsolutePosition = pos; | 1199 | AbsolutePosition = pos; |
1200 | 1200 | ||
1201 | // reset camera to avatar pos | ||
1202 | CameraPosition = pos; | ||
1203 | |||
1204 | if (m_teleportFlags == TeleportFlags.Default) | 1201 | if (m_teleportFlags == TeleportFlags.Default) |
1205 | { | 1202 | { |
1206 | Vector3 vel = Velocity; | 1203 | Vector3 vel = Velocity; |
@@ -1209,8 +1206,11 @@ no information to check this | |||
1209 | PhysicsActor.SetMomentum(vel); | 1206 | PhysicsActor.SetMomentum(vel); |
1210 | } | 1207 | } |
1211 | else | 1208 | else |
1209 | { | ||
1212 | AddToPhysicalScene(isFlying); | 1210 | AddToPhysicalScene(isFlying); |
1213 | 1211 | // reset camera to avatar pos | |
1212 | CameraPosition = pos; | ||
1213 | } | ||
1214 | 1214 | ||
1215 | if (ForceFly) | 1215 | if (ForceFly) |
1216 | { | 1216 | { |