OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-12-28 12:20:02 +00:00
parent 5c79e03f18 73b2c82427
commit 88c96d3973
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
View File

@ -80,6 +80,7 @@ namespace OpenSim.Capabilities.Handlers
{ {
m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service"); m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
return null;
} }
UUID textureID; UUID textureID;
@ -150,6 +151,7 @@ namespace OpenSim.Capabilities.Handlers
return true; return true;
} }
WriteTextureData(httpRequest, httpResponse, texture, format); WriteTextureData(httpRequest, httpResponse, texture, format);
return true;
} }
else else
{ {

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2821,7 +2821,7 @@ namespace OpenSim.Region.Framework.Scenes
m_followCamAuto = false; m_followCamAuto = false;
if(!m_mouseLook) 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; Vector3 camdif = new Vector3(1f, 0f, 0f) * Rotation;
float ftmp = camdif.X - CameraAtAxis.X; float ftmp = camdif.X - CameraAtAxis.X;