diff options
| author | Melanie | 2014-01-28 21:02:20 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-28 21:02:20 +0000 |
| commit | c6e9db58669d773c85041db99b19b942f70324f7 (patch) | |
| tree | 99f69fb669332cff69a45ce6f7473aed6d965a0d /OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.zip opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.tar.gz opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.tar.bz2 opensim-SC_OLD-c6e9db58669d773c85041db99b19b942f70324f7.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs index 58ce61a..f720748 100644 --- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | |||
| @@ -114,7 +114,8 @@ namespace OpenSim.Region.CoreModules.Asset | |||
| 114 | // | 114 | // |
| 115 | public bool Check(string id) | 115 | public bool Check(string id) |
| 116 | { | 116 | { |
| 117 | return false; | 117 | // XXX This is probably not an efficient implementation. |
| 118 | return Get(id) != null; | ||
| 118 | } | 119 | } |
| 119 | 120 | ||
| 120 | public void Cache(AssetBase asset) | 121 | public void Cache(AssetBase asset) |