From f021c64eb060046bff6e91384e1bbca0384b7d61 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 29 Dec 2016 12:34:09 +0000
Subject: Refactor: Rename IImprovedAssetCache to IAssetCache as the old
IAssetCache is long gone.
---
.../Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | 6 +++---
OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 6 +++---
OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | 6 +++---
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 8 ++++----
OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs | 6 +++---
.../CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 4 ++--
.../Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 4 ++--
.../CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | 4 ++--
.../ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | 4 ++--
.../ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs | 4 ++--
OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 4 ++--
11 files changed, 28 insertions(+), 28 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index 47dcbcd..6d1f0c2 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -57,13 +57,13 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
/// List of client methods to notify of results of decode
private readonly Dictionary> m_notifyList = new Dictionary>();
/// Cache that will store decoded JPEG2000 layer boundary data
- private IImprovedAssetCache m_cache;
- private IImprovedAssetCache Cache
+ private IAssetCache m_cache;
+ private IAssetCache Cache
{
get
{
if (m_cache == null)
- m_cache = m_scene.RequestModuleInterface();
+ m_cache = m_scene.RequestModuleInterface();
return m_cache;
}
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index ebec9d2..382b5f2 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Asset
///
///
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CenomeMemoryAssetCache")]
- public class CenomeMemoryAssetCache : IImprovedAssetCache, ISharedRegionModule
+ public class CenomeMemoryAssetCache : IAssetCache, ISharedRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.Asset
expirationTime);
}
- #region IImprovedAssetCache Members
+ #region IAssetCache Members
public bool Check(string id)
{
@@ -308,7 +308,7 @@ namespace OpenSim.Region.CoreModules.Asset
public void AddRegion(Scene scene)
{
if (m_enabled)
- scene.RegisterModuleInterface(this);
+ scene.RegisterModuleInterface(this);
}
///
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index f720748..d78b082 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -40,7 +40,7 @@ using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.Asset
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CoreAssetCache")]
- public class CoreAssetCache : ISharedRegionModule, IImprovedAssetCache
+ public class CoreAssetCache : ISharedRegionModule, IAssetCache
{
private static readonly ILog m_log =
LogManager.GetLogger(
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.Asset
public void AddRegion(Scene scene)
{
if (m_Enabled)
- scene.RegisterModuleInterface(this);
+ scene.RegisterModuleInterface(this);
}
public void RemoveRegion(Scene scene)
@@ -110,7 +110,7 @@ namespace OpenSim.Region.CoreModules.Asset
}
////////////////////////////////////////////////////////////
- // IImprovedAssetCache
+ // IAssetCache
//
public bool Check(string id)
{
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 5400c91..fcd4252 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -55,7 +55,7 @@ using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.Asset
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "FlotsamAssetCache")]
- public class FlotsamAssetCache : ISharedRegionModule, IImprovedAssetCache, IAssetService
+ public class FlotsamAssetCache : ISharedRegionModule, IAssetCache, IAssetService
{
private static readonly ILog m_log =
LogManager.GetLogger(
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Asset
{
if (m_Enabled)
{
- scene.RegisterModuleInterface(this);
+ scene.RegisterModuleInterface(this);
m_Scenes.Add(scene);
}
}
@@ -228,7 +228,7 @@ namespace OpenSim.Region.CoreModules.Asset
{
if (m_Enabled)
{
- scene.UnregisterModuleInterface(this);
+ scene.UnregisterModuleInterface(this);
m_Scenes.Remove(scene);
lock(timerLock)
{
@@ -271,7 +271,7 @@ namespace OpenSim.Region.CoreModules.Asset
}
////////////////////////////////////////////////////////////
- // IImprovedAssetCache
+ // IAssetCache
//
private void UpdateWeakReference(string key, AssetBase asset)
{
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index 5f76ac2..7343f4f 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -41,7 +41,7 @@ using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.Asset
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GlynnTuckerAssetCache")]
- public class GlynnTuckerAssetCache : ISharedRegionModule, IImprovedAssetCache
+ public class GlynnTuckerAssetCache : ISharedRegionModule, IAssetCache
{
private static readonly ILog m_log =
LogManager.GetLogger(
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.Asset
public void AddRegion(Scene scene)
{
if (m_Enabled)
- scene.RegisterModuleInterface(this);
+ scene.RegisterModuleInterface(this);
}
public void RemoveRegion(Scene scene)
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.Asset
}
////////////////////////////////////////////////////////////
- // IImprovedAssetCache
+ // IAssetCache
//
public bool Check(string id)
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 41a3f52..67256ee 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
if (bakedTextures.Count == 0)
return false;
- IImprovedAssetCache cache = sp.Scene.RequestModuleInterface();
+ IAssetCache cache = sp.Scene.RequestModuleInterface();
if(cache == null)
return true; // no baked local caching so nothing to do
@@ -705,7 +705,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
return 0;
int texturesRebaked = 0;
-// IImprovedAssetCache cache = m_scene.RequestModuleInterface();
+// IAssetCache cache = m_scene.RequestModuleInterface();
for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
{
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 3f7a8ee..df5265c 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
Dictionary m_classifiedCache = new Dictionary();
Dictionary m_classifiedInterest = new Dictionary();
ExpiringCache m_profilesCache = new ExpiringCache();
- IImprovedAssetCache m_assetCache;
+ IAssetCache m_assetCache;
private JsonRpcRequestManager rpc = new JsonRpcRequestManager();
private bool m_allowUserProfileWebURLs = true;
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
{
if(!Enabled)
return;
- m_assetCache = Scene.RequestModuleInterface();
+ m_assetCache = Scene.RequestModuleInterface();
}
///
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 9eb41f9..31d1129 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
- private IImprovedAssetCache m_Cache = null;
+ private IAssetCache m_Cache = null;
private IAssetService m_GridService;
private IAssetService m_HGService;
@@ -176,7 +176,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (m_Cache == null)
{
- m_Cache = scene.RequestModuleInterface();
+ m_Cache = scene.RequestModuleInterface();
if (!(m_Cache is ISharedRegionModule))
m_Cache = null;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index 5f34450..d5d6667 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private IImprovedAssetCache m_Cache = null;
+ private IAssetCache m_Cache = null;
private IAssetService m_AssetService;
@@ -128,7 +128,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (m_Cache == null)
{
- m_Cache = scene.RequestModuleInterface();
+ m_Cache = scene.RequestModuleInterface();
if (!(m_Cache is ISharedRegionModule))
m_Cache = null;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
index e6eeacf..ff04f9d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
MethodBase.GetCurrentMethod().DeclaringType);
private bool m_Enabled = false;
- private IImprovedAssetCache m_Cache;
+ private IAssetCache m_Cache;
public Type ReplaceableInterface
{
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (m_Cache == null)
{
- m_Cache = scene.RequestModuleInterface();
+ m_Cache = scene.RequestModuleInterface();
// Since we are a shared module and scene data is not
// available for every method, the cache must be shared, too
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 7312bc3..b259f52 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.OptionalModules.Materials
public Type ReplaceableInterface { get { return null; } }
- IImprovedAssetCache m_cache;
+ IAssetCache m_cache;
private Scene m_scene = null;
private bool m_enabled = false;
private int m_maxMaterialsPerTransaction = 50;
@@ -207,7 +207,7 @@ namespace OpenSim.Region.OptionalModules.Materials
{
if (!m_enabled) return;
- m_cache = scene.RequestModuleInterface();
+ m_cache = scene.RequestModuleInterface();
ISimulatorFeaturesModule featuresModule = scene.RequestModuleInterface();
if (featuresModule != null)
featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
--
cgit v1.1