From bf1f4d1384aa087af39b5099f3317f8609283232 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 25 Dec 2016 16:51:54 +0000 Subject: [PATCH 1/3] fix typos (thanks you know who) --- bin/config-include/FlotsamCache.ini.example | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example index 666681211d..c0d743093b 100644 --- a/bin/config-include/FlotsamCache.ini.example +++ b/bin/config-include/FlotsamCache.ini.example @@ -21,7 +21,7 @@ ; Set to false for no memory cache ; assets can be requested several times in short periods - ; so even a small memory cache is usefull + ; so even a small memory cache is useful MemoryCacheEnabled = true ; Set to false for no file cache @@ -31,9 +31,8 @@ ; even a few minutes may mean many assets loaded to memory, if not all. ; this is good if memory is not a problem. ; if memory is a problem then a few seconds may actually save same. - ; reducing duplications. ; see hit rates with console comand: fcache status - MemoryCacheTimeout = .001 // 3.6s ie around 4s (1s resolution) + MemoryCacheTimeout = .001 ; 3.6s ie around 4s (1s resolution) ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes ; Specify 0 if you do not want your disk cache to expire From 65b4e17a80f5417213ab652ce56d1946d46b2471 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 26 Dec 2016 19:38:13 +0000 Subject: [PATCH 2/3] robust textures add missing returns or redir case --- .../Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs index 518f74ebc8..5f86ed4dbf 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 { From 73b2c82427cf25b568705da0920e68effaaf0755 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 28 Dec 2016 12:19:05 +0000 Subject: [PATCH 3/3] adjust camera collision detection checks for new FS --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 463f6c8d0d..5082b9d654 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;