From 65b4e17a80f5417213ab652ce56d1946d46b2471 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 26 Dec 2016 19:38:13 +0000
Subject: robust textures add missing returns or redir case

---
 OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim')

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
                 {
-- 
cgit v1.1


From 73b2c82427cf25b568705da0920e68effaaf0755 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 28 Dec 2016 12:19:05 +0000
Subject: adjust camera collision detection checks for new FS

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

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;
-- 
cgit v1.1