From a049e37952c76ce3823d7a1e4e1ba9d4f6e7f63f Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 14 Aug 2020 01:49:58 +0100 Subject: [PATCH] go back using File.Exists on flotsam --- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 11 +---------- OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 3 +-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 114e26adc1..920983de1b 100755 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs @@ -548,16 +548,7 @@ namespace OpenSim.Region.CoreModules.Asset string filename = GetFileName(id); try { - var fileinfo = new FileInfo(id); - if(fileinfo.Exists) - { - if(fileinfo.Length == 0) - { - fileinfo.Delete(); - return false; - } - return true; - } + return File.Exists(GetFileName(id)); } catch { diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index acc4d350a3..79093316ee 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs @@ -106,10 +106,9 @@ namespace OpenSim.Region.Framework.Scenes public class ScenePermissions { -// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private Scene m_scene; - public ScenePermissions(Scene scene) { m_scene = scene;