diff options
author | Melanie | 2013-01-07 15:06:17 +0100 |
---|---|---|
committer | Melanie | 2013-01-07 15:06:17 +0100 |
commit | 910a94d14390d9cac6d8bc396cc3a61f5ac278d9 (patch) | |
tree | 8a3d941090aeac4462ea97721c8fd98627005927 /OpenSim/Region/Framework | |
parent | * This finishes the implementation of AgentCachedTexture. Requires the XBak... (diff) | |
parent | also exclude land (diff) | |
download | opensim-SC_OLD-910a94d14390d9cac6d8bc396cc3a61f5ac278d9.zip opensim-SC_OLD-910a94d14390d9cac6d8bc396cc3a61f5ac278d9.tar.gz opensim-SC_OLD-910a94d14390d9cac6d8bc396cc3a61f5ac278d9.tar.bz2 opensim-SC_OLD-910a94d14390d9cac6d8bc396cc3a61f5ac278d9.tar.xz |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5087882..4504e18 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1415,8 +1415,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1415 | 1415 | ||
1416 | if (m_followCamAuto) | 1416 | if (m_followCamAuto) |
1417 | { | 1417 | { |
1418 | if (hitYN) | 1418 | if (hitYN && localid != LocalId) |
1419 | { | 1419 | { |
1420 | |||
1420 | CameraConstraintActive = true; | 1421 | CameraConstraintActive = true; |
1421 | //m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance); | 1422 | //m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance); |
1422 | 1423 | ||
@@ -2282,7 +2283,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2282 | ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot"); | 2283 | ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot"); |
2283 | return; | 2284 | return; |
2284 | } | 2285 | } |
2285 | // m_log.InfoFormat("physsit {0} {1}", offset.ToString(),Orientation.ToString()); | ||
2286 | 2286 | ||
2287 | RemoveFromPhysicalScene(); | 2287 | RemoveFromPhysicalScene(); |
2288 | 2288 | ||
@@ -2293,7 +2293,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2293 | 2293 | ||
2294 | part.AddSittingAvatar(UUID); | 2294 | part.AddSittingAvatar(UUID); |
2295 | 2295 | ||
2296 | |||
2297 | Vector3 cameraAtOffset = part.GetCameraAtOffset(); | 2296 | Vector3 cameraAtOffset = part.GetCameraAtOffset(); |
2298 | Vector3 cameraEyeOffset = part.GetCameraEyeOffset(); | 2297 | Vector3 cameraEyeOffset = part.GetCameraEyeOffset(); |
2299 | bool forceMouselook = part.GetForceMouselook(); | 2298 | bool forceMouselook = part.GetForceMouselook(); |