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/Services/Connectors | |
parent | Add an option to update the file access time even when an asset is found in c... (diff) | |
download | opensim-SC_OLD-f021c64eb060046bff6e91384e1bbca0384b7d61.zip opensim-SC_OLD-f021c64eb060046bff6e91384e1bbca0384b7d61.tar.gz opensim-SC_OLD-f021c64eb060046bff6e91384e1bbca0384b7d61.tar.bz2 opensim-SC_OLD-f021c64eb060046bff6e91384e1bbca0384b7d61.tar.xz |
Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache is long gone.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index a6e8eb4..b8449d7 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Services.Connectors | |||
49 | const int MAXSENDRETRIESLEN = 30; | 49 | const int MAXSENDRETRIESLEN = 30; |
50 | 50 | ||
51 | private string m_ServerURI = String.Empty; | 51 | private string m_ServerURI = String.Empty; |
52 | private IImprovedAssetCache m_Cache = null; | 52 | private IAssetCache m_Cache = null; |
53 | private int m_retryCounter; | 53 | private int m_retryCounter; |
54 | private bool m_inRetries; | 54 | private bool m_inRetries; |
55 | private List<AssetBase>[] m_sendRetries = new List<AssetBase>[MAXSENDRETRIESLEN]; | 55 | private List<AssetBase>[] m_sendRetries = new List<AssetBase>[MAXSENDRETRIESLEN]; |
@@ -233,7 +233,7 @@ namespace OpenSim.Services.Connectors | |||
233 | } | 233 | } |
234 | } | 234 | } |
235 | 235 | ||
236 | protected void SetCache(IImprovedAssetCache cache) | 236 | protected void SetCache(IAssetCache cache) |
237 | { | 237 | { |
238 | m_Cache = cache; | 238 | m_Cache = cache; |
239 | } | 239 | } |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 9ad4a7a..531939f 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
55 | private static string ZeroID = UUID.Zero.ToString(); | 55 | private static string ZeroID = UUID.Zero.ToString(); |
56 | 56 | ||
57 | private string m_serverUrl = String.Empty; | 57 | private string m_serverUrl = String.Empty; |
58 | private IImprovedAssetCache m_cache; | 58 | private IAssetCache m_cache; |
59 | private bool m_Enabled = false; | 59 | private bool m_Enabled = false; |
60 | 60 | ||
61 | #region ISharedRegionModule | 61 | #region ISharedRegionModule |
@@ -65,7 +65,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
65 | { | 65 | { |
66 | if (m_cache == null) | 66 | if (m_cache == null) |
67 | { | 67 | { |
68 | IImprovedAssetCache cache = scene.RequestModuleInterface<IImprovedAssetCache>(); | 68 | IAssetCache cache = scene.RequestModuleInterface<IAssetCache>(); |
69 | if (cache is ISharedRegionModule) | 69 | if (cache is ISharedRegionModule) |
70 | m_cache = cache; | 70 | m_cache = cache; |
71 | } | 71 | } |