diff options
| author | UbitUmarov | 2016-12-28 12:20:02 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-28 12:20:02 +0000 |
| commit | 88c96d3973d362edabfdaedf8eeeebbf60e7dced (patch) | |
| tree | d24fbae046a3c677677512b03360231e5e2ae40c /OpenSim/Region | |
| parent | some cleanup (diff) | |
| parent | adjust camera collision detection checks for new FS (diff) | |
| download | opensim-SC-88c96d3973d362edabfdaedf8eeeebbf60e7dced.zip opensim-SC-88c96d3973d362edabfdaedf8eeeebbf60e7dced.tar.gz opensim-SC-88c96d3973d362edabfdaedf8eeeebbf60e7dced.tar.bz2 opensim-SC-88c96d3973d362edabfdaedf8eeeebbf60e7dced.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 463f6c8..5082b9d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2821,7 +2821,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2821 | m_followCamAuto = false; | 2821 | m_followCamAuto = false; |
| 2822 | if(!m_mouseLook) | 2822 | if(!m_mouseLook) |
| 2823 | { | 2823 | { |
| 2824 | if((CameraUpAxis.Z > 0.959f && CameraUpAxis.Z < 0.98f)) | 2824 | if((CameraUpAxis.Z > 0.959f && CameraUpAxis.Z < 0.99f)) |
| 2825 | { | 2825 | { |
| 2826 | Vector3 camdif = new Vector3(1f, 0f, 0f) * Rotation; | 2826 | Vector3 camdif = new Vector3(1f, 0f, 0f) * Rotation; |
| 2827 | float ftmp = camdif.X - CameraAtAxis.X; | 2827 | float ftmp = camdif.X - CameraAtAxis.X; |