diff options
| author | UbitUmarov | 2016-12-30 01:52:02 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-30 01:52:02 +0000 |
| commit | 2a01173715e8adc9ea2f263221aed1302ed7675f (patch) | |
| tree | 116300a1eebe09421da112635be883196f2b41f0 /OpenSim/Services/Connectors/SimianGrid | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Serving robots.txt from bin Idea of solution for http://opensimulator.org/man... (diff) | |
| download | opensim-SC-2a01173715e8adc9ea2f263221aed1302ed7675f.zip opensim-SC-2a01173715e8adc9ea2f263221aed1302ed7675f.tar.gz opensim-SC-2a01173715e8adc9ea2f263221aed1302ed7675f.tar.bz2 opensim-SC-2a01173715e8adc9ea2f263221aed1302ed7675f.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | } |