diff options
author | Melanie Thielker | 2016-12-29 12:34:09 +0000 |
---|---|---|
committer | Melanie Thielker | 2016-12-29 12:34:09 +0000 |
commit | f021c64eb060046bff6e91384e1bbca0384b7d61 (patch) | |
tree | 1ccd718bd77b9c502e9310873eab35e035a379b0 /OpenSim/Region/CoreModules/Avatar | |
parent | Add an option to update the file access time even when an asset is found in c... (diff) | |
download | opensim-SC-f021c64eb060046bff6e91384e1bbca0384b7d61.zip opensim-SC-f021c64eb060046bff6e91384e1bbca0384b7d61.tar.gz opensim-SC-f021c64eb060046bff6e91384e1bbca0384b7d61.tar.bz2 opensim-SC-f021c64eb060046bff6e91384e1bbca0384b7d61.tar.xz |
Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache is long gone.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 4 |
2 files changed, 4 insertions, 4 deletions
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 | |||
288 | if (bakedTextures.Count == 0) | 288 | if (bakedTextures.Count == 0) |
289 | return false; | 289 | return false; |
290 | 290 | ||
291 | IImprovedAssetCache cache = sp.Scene.RequestModuleInterface<IImprovedAssetCache>(); | 291 | IAssetCache cache = sp.Scene.RequestModuleInterface<IAssetCache>(); |
292 | if(cache == null) | 292 | if(cache == null) |
293 | return true; // no baked local caching so nothing to do | 293 | return true; // no baked local caching so nothing to do |
294 | 294 | ||
@@ -705,7 +705,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
705 | return 0; | 705 | return 0; |
706 | 706 | ||
707 | int texturesRebaked = 0; | 707 | int texturesRebaked = 0; |
708 | // IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>(); | 708 | // IAssetCache cache = m_scene.RequestModuleInterface<IAssetCache>(); |
709 | 709 | ||
710 | for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++) | 710 | for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++) |
711 | { | 711 | { |
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 | |||
69 | Dictionary<UUID, UUID> m_classifiedCache = new Dictionary<UUID, UUID>(); | 69 | Dictionary<UUID, UUID> m_classifiedCache = new Dictionary<UUID, UUID>(); |
70 | Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>(); | 70 | Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>(); |
71 | ExpiringCache<UUID, UserProfileCacheEntry> m_profilesCache = new ExpiringCache<UUID, UserProfileCacheEntry>(); | 71 | ExpiringCache<UUID, UserProfileCacheEntry> m_profilesCache = new ExpiringCache<UUID, UserProfileCacheEntry>(); |
72 | IImprovedAssetCache m_assetCache; | 72 | IAssetCache m_assetCache; |
73 | 73 | ||
74 | private JsonRpcRequestManager rpc = new JsonRpcRequestManager(); | 74 | private JsonRpcRequestManager rpc = new JsonRpcRequestManager(); |
75 | private bool m_allowUserProfileWebURLs = true; | 75 | private bool m_allowUserProfileWebURLs = true; |
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
221 | { | 221 | { |
222 | if(!Enabled) | 222 | if(!Enabled) |
223 | return; | 223 | return; |
224 | m_assetCache = Scene.RequestModuleInterface<IImprovedAssetCache>(); | 224 | m_assetCache = Scene.RequestModuleInterface<IAssetCache>(); |
225 | } | 225 | } |
226 | 226 | ||
227 | /// <summary> | 227 | /// <summary> |