Merge branch 'master' into httptests

2026-08-07 01:35:46 +08:00 · 2016-12-28 12:20:02 +00:00
parent 5c79e03f18 73b2c82427
commit 88c96d3973
2 changed files with 3 additions and 1 deletions
--- 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
                {