Merge branch 'master' into httptests

2 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
index 518f74e..5f86ed4 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
@@ -80,6 +80,7 @@ namespace OpenSim.Capabilities.Handlers
             {
                 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
                 httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                return null;
             }
  
             UUID textureID;
@@ -150,6 +151,7 @@ namespace OpenSim.Capabilities.Handlers
                         return true;
                     }
                     WriteTextureData(httpRequest, httpResponse, texture, format);
+                    return true;
                 }
                 else
                 {
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
             m_followCamAuto = false;
             if(!m_mouseLook)
             {
-                if((CameraUpAxis.Z > 0.959f && CameraUpAxis.Z < 0.98f))
+                if((CameraUpAxis.Z > 0.959f && CameraUpAxis.Z < 0.99f))
                 {
                     Vector3 camdif = new Vector3(1f, 0f, 0f) * Rotation;
                     float ftmp = camdif.X - CameraAtAxis.X;