Merge branch 'master' into httptests

1 files changed, 2 insertions, 0 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
                 {