diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Services/Interfaces/IAssetService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IAssetService.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs index 1ac1cec..80494f1 100644 --- a/OpenSim/Services/Interfaces/IAssetService.cs +++ b/OpenSim/Services/Interfaces/IAssetService.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Services.Interfaces | |||
56 | byte[] GetData(string id); | 56 | byte[] GetData(string id); |
57 | 57 | ||
58 | /// <summary> | 58 | /// <summary> |
59 | /// Synchronously fetches an asset from the local cache only | 59 | /// Synchronously fetches an asset from the local cache only. |
60 | /// </summary> | 60 | /// </summary> |
61 | /// <param name="id">Asset ID</param> | 61 | /// <param name="id">Asset ID</param> |
62 | /// <returns>The fetched asset, or null if it did not exist in the local cache</returns> | 62 | /// <returns>The fetched asset, or null if it did not exist in the local cache</returns> |
@@ -75,7 +75,9 @@ namespace OpenSim.Services.Interfaces | |||
75 | /// <summary> | 75 | /// <summary> |
76 | /// Creates a new asset | 76 | /// Creates a new asset |
77 | /// </summary> | 77 | /// </summary> |
78 | /// Returns a random ID if none is passed into it | 78 | /// <remarks> |
79 | /// Returns a random ID if none is passed via the asset argument. | ||
80 | /// </remarks> | ||
79 | /// <param name="asset"></param> | 81 | /// <param name="asset"></param> |
80 | /// <returns></returns> | 82 | /// <returns></returns> |
81 | string Store(AssetBase asset); | 83 | string Store(AssetBase asset); |
@@ -83,7 +85,9 @@ namespace OpenSim.Services.Interfaces | |||
83 | /// <summary> | 85 | /// <summary> |
84 | /// Update an asset's content | 86 | /// Update an asset's content |
85 | /// </summary> | 87 | /// </summary> |
88 | /// <remarks> | ||
86 | /// Attachments and bare scripts need this!! | 89 | /// Attachments and bare scripts need this!! |
90 | /// </remarks> | ||
87 | /// <param name="id"> </param> | 91 | /// <param name="id"> </param> |
88 | /// <param name="data"></param> | 92 | /// <param name="data"></param> |
89 | /// <returns></returns> | 93 | /// <returns></returns> |