aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService
diff options
context:
space:
mode:
authorMelanie2010-05-09 17:04:23 +0100
committerMelanie2010-05-09 17:04:23 +0100
commit4e0d62547d2760ce48cf64373917dcfb893da543 (patch)
tree9f84ddc57b58ed107cd6d610aaeb62039d483a71 /OpenSim/Services/AssetService
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentAdd a field asset_flags and a corresponding enum to the asset database. This (diff)
downloadopensim-SC_OLD-4e0d62547d2760ce48cf64373917dcfb893da543.zip
opensim-SC_OLD-4e0d62547d2760ce48cf64373917dcfb893da543.tar.gz
opensim-SC_OLD-4e0d62547d2760ce48cf64373917dcfb893da543.tar.bz2
opensim-SC_OLD-4e0d62547d2760ce48cf64373917dcfb893da543.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/AssetService')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 4e512e7..2114933 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -181,6 +181,7 @@ namespace OpenSim.Services.AssetService
181 MainConsole.Instance.Output(String.Format("Description: {0}", asset.Description)); 181 MainConsole.Instance.Output(String.Format("Description: {0}", asset.Description));
182 MainConsole.Instance.Output(String.Format("Type: {0}", asset.Type)); 182 MainConsole.Instance.Output(String.Format("Type: {0}", asset.Type));
183 MainConsole.Instance.Output(String.Format("Content-type: {0}", asset.Metadata.ContentType)); 183 MainConsole.Instance.Output(String.Format("Content-type: {0}", asset.Metadata.ContentType));
184 MainConsole.Instance.Output(String.Format("Flags: {0}", asset.Metadata.Flags.ToString()));
184 185
185 for (i = 0 ; i < 5 ; i++) 186 for (i = 0 ; i < 5 ; i++)
186 { 187 {