aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorMelanie2011-04-17 18:42:06 +0200
committerMelanie2011-04-17 18:42:06 +0200
commitc02e0e930d078ab5e2d4070df65c3d74f5812cbc (patch)
treeabb12e192cf0675b675d874eb86b65aa4fd177d7 /OpenSim/Services/Interfaces
parentFix the cert validation handler so that it will not block other parts of (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.zip
opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.gz
opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.bz2
opensim-SC-c02e0e930d078ab5e2d4070df65c3d74f5812cbc.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r--OpenSim/Services/Interfaces/IAssetService.cs5
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>