diff options
| author | UbitUmarov | 2017-04-25 17:59:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-04-25 17:59:53 +0100 |
| commit | a680d8b8d700f78beb1a9eea98b52d59118efe2e (patch) | |
| tree | dd084e74fb61400c704a14dcfa8689670acb9ec2 /OpenSim/Framework/IAssetCache.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | move mesh pbs creation code out of mesh upload code into to PrimitiveBaseShap... (diff) | |
| download | opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.zip opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.gz opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.bz2 opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Framework/IAssetCache.cs')
| -rw-r--r-- | OpenSim/Framework/IAssetCache.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/IAssetCache.cs b/OpenSim/Framework/IAssetCache.cs index 8477116..2df9199 100644 --- a/OpenSim/Framework/IAssetCache.cs +++ b/OpenSim/Framework/IAssetCache.cs | |||
| @@ -47,8 +47,9 @@ namespace OpenSim.Framework | |||
| 47 | /// Get an asset by its id. | 47 | /// Get an asset by its id. |
| 48 | /// </summary> | 48 | /// </summary> |
| 49 | /// <param name='id'></param> | 49 | /// <param name='id'></param> |
| 50 | /// <returns>null if the asset does not exist.</returns> | 50 | /// <param name='asset'>Will be set to null if no asset was found</param> |
| 51 | AssetBase Get(string id); | 51 | /// <returns>False if the asset has been negative-cached</returns> |
| 52 | bool Get(string id, out AssetBase asset); | ||
| 52 | 53 | ||
| 53 | /// <summary> | 54 | /// <summary> |
| 54 | /// Check whether an asset with the specified id exists in the cache. | 55 | /// Check whether an asset with the specified id exists in the cache. |