diff options
author | John Hurliman | 2010-02-22 13:27:17 -0800 |
---|---|---|
committer | John Hurliman | 2010-02-22 13:27:17 -0800 |
commit | 7665aad002ef066fc31fa9497225d2668641c769 (patch) | |
tree | ce2ad89f1ffd20c6f5e9a3b6558f7b90c651c830 /OpenSim/Framework/AssetBase.cs | |
parent | * Added a sanity check for missing asset data in LLClientView (diff) | |
download | opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.zip opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.gz opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.bz2 opensim-SC-7665aad002ef066fc31fa9497225d2668641c769.tar.xz |
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AssetBase.cs | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 3e64e47..f21a9b5 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Framework | |||
61 | m_metadata.Type = (sbyte)AssetType.Unknown; | 61 | m_metadata.Type = (sbyte)AssetType.Unknown; |
62 | } | 62 | } |
63 | 63 | ||
64 | public AssetBase(UUID assetID, string name, sbyte assetType) | 64 | public AssetBase(UUID assetID, string name, sbyte assetType, UUID creatorID) |
65 | { | 65 | { |
66 | if (assetType == (sbyte)AssetType.Unknown) | 66 | if (assetType == (sbyte)AssetType.Unknown) |
67 | { | 67 | { |
@@ -76,7 +76,7 @@ namespace OpenSim.Framework | |||
76 | m_metadata.Type = assetType; | 76 | m_metadata.Type = assetType; |
77 | } | 77 | } |
78 | 78 | ||
79 | public AssetBase(string assetID, string name, sbyte assetType) | 79 | public AssetBase(string assetID, string name, sbyte assetType, UUID creatorID) |
80 | { | 80 | { |
81 | if (assetType == (sbyte)AssetType.Unknown) | 81 | if (assetType == (sbyte)AssetType.Unknown) |
82 | { | 82 | { |
@@ -220,7 +220,6 @@ namespace OpenSim.Framework | |||
220 | public class AssetMetadata | 220 | public class AssetMetadata |
221 | { | 221 | { |
222 | private UUID m_fullid; | 222 | private UUID m_fullid; |
223 | // m_id added as a dirty hack to transition from FullID to ID | ||
224 | private string m_id; | 223 | private string m_id; |
225 | private string m_name = String.Empty; | 224 | private string m_name = String.Empty; |
226 | private string m_description = String.Empty; | 225 | private string m_description = String.Empty; |
@@ -230,8 +229,7 @@ namespace OpenSim.Framework | |||
230 | private byte[] m_sha1; | 229 | private byte[] m_sha1; |
231 | private bool m_local; | 230 | private bool m_local; |
232 | private bool m_temporary; | 231 | private bool m_temporary; |
233 | //private Dictionary<string, Uri> m_methods = new Dictionary<string, Uri>(); | 232 | private UUID m_creatorid; |
234 | //private OSDMap m_extra_data; | ||
235 | 233 | ||
236 | public UUID FullID | 234 | public UUID FullID |
237 | { | 235 | { |
@@ -324,16 +322,10 @@ namespace OpenSim.Framework | |||
324 | set { m_temporary = value; } | 322 | set { m_temporary = value; } |
325 | } | 323 | } |
326 | 324 | ||
327 | //public Dictionary<string, Uri> Methods | 325 | public UUID CreatorID |
328 | //{ | 326 | { |
329 | // get { return m_methods; } | 327 | get { return m_creatorid; } |
330 | // set { m_methods = value; } | 328 | set { m_creatorid = value; } |
331 | //} | 329 | } |
332 | |||
333 | //public OSDMap ExtraData | ||
334 | //{ | ||
335 | // get { return m_extra_data; } | ||
336 | // set { m_extra_data = value; } | ||
337 | //} | ||
338 | } | 330 | } |
339 | } | 331 | } |