diff options
| author | Mic Bowman | 2011-04-18 11:29:43 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-18 11:29:43 -0700 |
| commit | 452ae375f0fdd62ba16fb170869ea470c6906cfe (patch) | |
| tree | b5a7d364e509f2ff7f1b9086e2ba5658f4ee99ac /OpenSim/Services/Interfaces | |
| parent | Remove the call to remove tokens from the parent. Under heavy load (diff) | |
| parent | Mantis #5442: Add admin_save_heightmap (diff) | |
| download | opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.zip opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.gz opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.bz2 opensim-SC_OLD-452ae375f0fdd62ba16fb170869ea470c6906cfe.tar.xz | |
Merge branch 'master' into test-merge0418
Diffstat (limited to 'OpenSim/Services/Interfaces')
| -rw-r--r-- | OpenSim/Services/Interfaces/IAssetService.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs index 3be6815..1ac1cec 100644 --- a/OpenSim/Services/Interfaces/IAssetService.cs +++ b/OpenSim/Services/Interfaces/IAssetService.cs | |||
| @@ -48,6 +48,11 @@ namespace OpenSim.Services.Interfaces | |||
| 48 | /// <returns></returns> | 48 | /// <returns></returns> |
| 49 | AssetMetadata GetMetadata(string id); | 49 | AssetMetadata GetMetadata(string id); |
| 50 | 50 | ||
| 51 | /// <summary> | ||
| 52 | /// Get an asset's data, ignoring the metadata. | ||
| 53 | /// </summary> | ||
| 54 | /// <param name="id"></param> | ||
| 55 | /// <returns>null if there is no such asset</returns> | ||
| 51 | byte[] GetData(string id); | 56 | byte[] GetData(string id); |
| 52 | 57 | ||
| 53 | /// <summary> | 58 | /// <summary> |