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 | |
parent | * Added a sanity check for missing asset data in LLClientView (diff) | |
download | opensim-SC_OLD-7665aad002ef066fc31fa9497225d2668641c769.zip opensim-SC_OLD-7665aad002ef066fc31fa9497225d2668641c769.tar.gz opensim-SC_OLD-7665aad002ef066fc31fa9497225d2668641c769.tar.bz2 opensim-SC_OLD-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 'OpenSim')
34 files changed, 74 insertions, 78 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 457177d..babe716 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -1564,7 +1564,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1564 | assets = doc.GetElementsByTagName("RequiredAsset"); | 1564 | assets = doc.GetElementsByTagName("RequiredAsset"); |
1565 | foreach (XmlNode asset in assets) | 1565 | foreach (XmlNode asset in assets) |
1566 | { | 1566 | { |
1567 | AssetBase rass = new AssetBase(UUID.Random(), GetStringAttribute(asset,"name",""), SByte.Parse(GetStringAttribute(asset,"type",""))); | 1567 | AssetBase rass = new AssetBase(UUID.Random(), GetStringAttribute(asset,"name",""), SByte.Parse(GetStringAttribute(asset,"type","")), UUID.Zero); |
1568 | rass.Description = GetStringAttribute(asset,"desc",""); | 1568 | rass.Description = GetStringAttribute(asset,"desc",""); |
1569 | rass.Local = Boolean.Parse(GetStringAttribute(asset,"local","")); | 1569 | rass.Local = Boolean.Parse(GetStringAttribute(asset,"local","")); |
1570 | rass.Temporary = Boolean.Parse(GetStringAttribute(asset,"temporary","")); | 1570 | rass.Temporary = Boolean.Parse(GetStringAttribute(asset,"temporary","")); |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index 66572d5..54ce80e 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | |||
@@ -261,7 +261,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
261 | modified = (asset != null); | 261 | modified = (asset != null); |
262 | created = !modified; | 262 | created = !modified; |
263 | 263 | ||
264 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type"))); | 264 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero); |
265 | asset.Description = xml.GetAttribute("desc"); | 265 | asset.Description = xml.GetAttribute("desc"); |
266 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; | 266 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; |
267 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; | 267 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; |
@@ -338,7 +338,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
338 | modified = (asset != null); | 338 | modified = (asset != null); |
339 | created = !modified; | 339 | created = !modified; |
340 | 340 | ||
341 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type"))); | 341 | asset = new AssetBase(uuid, xml.GetAttribute("name"), SByte.Parse(xml.GetAttribute("type")), UUID.Zero); |
342 | asset.Description = xml.GetAttribute("desc"); | 342 | asset.Description = xml.GetAttribute("desc"); |
343 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; | 343 | asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0; |
344 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; | 344 | asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0; |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index fb1d739..9ab2763 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -1871,7 +1871,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1871 | 1871 | ||
1872 | // Create AssetBase entity to hold the inlined asset | 1872 | // Create AssetBase entity to hold the inlined asset |
1873 | 1873 | ||
1874 | asset = new AssetBase(uuid, name, type); | 1874 | asset = new AssetBase(uuid, name, type, UUID.Zero); |
1875 | 1875 | ||
1876 | asset.Description = desc; | 1876 | asset.Description = desc; |
1877 | asset.Local = local; | 1877 | asset.Local = local; |
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs index 1ce4abf..ee149ce 100644 --- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs | |||
@@ -135,7 +135,8 @@ namespace OpenSim.Data.MSSQL | |||
135 | AssetBase asset = new AssetBase( | 135 | AssetBase asset = new AssetBase( |
136 | new UUID((Guid)reader["id"]), | 136 | new UUID((Guid)reader["id"]), |
137 | (string)reader["name"], | 137 | (string)reader["name"], |
138 | Convert.ToSByte(reader["assetType"]) | 138 | Convert.ToSByte(reader["assetType"]), |
139 | UUID.Zero | ||
139 | ); | 140 | ); |
140 | // Region Main | 141 | // Region Main |
141 | asset.Description = (string)reader["description"]; | 142 | asset.Description = (string)reader["description"]; |
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 666c22f..a1b5d94 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs | |||
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL | |||
122 | { | 122 | { |
123 | if (dbReader.Read()) | 123 | if (dbReader.Read()) |
124 | { | 124 | { |
125 | asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"]); | 125 | asset = new AssetBase(assetID, (string)dbReader["name"], (sbyte)dbReader["assetType"], UUID.Zero); |
126 | asset.Data = (byte[])dbReader["data"]; | 126 | asset.Data = (byte[])dbReader["data"]; |
127 | asset.Description = (string)dbReader["description"]; | 127 | asset.Description = (string)dbReader["description"]; |
128 | 128 | ||
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index c52f60b..46f173e 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
@@ -234,7 +234,8 @@ namespace OpenSim.Data.SQLite | |||
234 | AssetBase asset = new AssetBase( | 234 | AssetBase asset = new AssetBase( |
235 | new UUID((String)row["UUID"]), | 235 | new UUID((String)row["UUID"]), |
236 | (String)row["Name"], | 236 | (String)row["Name"], |
237 | Convert.ToSByte(row["Type"]) | 237 | Convert.ToSByte(row["Type"]), |
238 | UUID.Zero | ||
238 | ); | 239 | ); |
239 | 240 | ||
240 | asset.Description = (String) row["Description"]; | 241 | asset.Description = (String) row["Description"]; |
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index 25aed61..58a17c2 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs | |||
@@ -66,9 +66,9 @@ namespace OpenSim.Data.Tests | |||
66 | [Test] | 66 | [Test] |
67 | public void T010_StoreSimpleAsset() | 67 | public void T010_StoreSimpleAsset() |
68 | { | 68 | { |
69 | AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture); | 69 | AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero); |
70 | AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture); | 70 | AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, UUID.Zero); |
71 | AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture); | 71 | AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, UUID.Zero); |
72 | a1.Data = asset1; | 72 | a1.Data = asset1; |
73 | a2.Data = asset1; | 73 | a2.Data = asset1; |
74 | a3.Data = asset1; | 74 | a3.Data = asset1; |
diff --git a/OpenSim/Data/Tests/PropertyCompareConstraint.cs b/OpenSim/Data/Tests/PropertyCompareConstraint.cs index 5b1f935..8c28fad 100644 --- a/OpenSim/Data/Tests/PropertyCompareConstraint.cs +++ b/OpenSim/Data/Tests/PropertyCompareConstraint.cs | |||
@@ -297,8 +297,8 @@ namespace OpenSim.Data.Tests | |||
297 | public void AssetShouldMatch() | 297 | public void AssetShouldMatch() |
298 | { | 298 | { |
299 | UUID uuid1 = UUID.Random(); | 299 | UUID uuid1 = UUID.Random(); |
300 | AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture); | 300 | AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero); |
301 | AssetBase expected = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture); | 301 | AssetBase expected = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero); |
302 | 302 | ||
303 | var constraint = Constraints.PropertyCompareConstraint(expected); | 303 | var constraint = Constraints.PropertyCompareConstraint(expected); |
304 | 304 | ||
@@ -309,8 +309,8 @@ namespace OpenSim.Data.Tests | |||
309 | public void AssetShouldNotMatch() | 309 | public void AssetShouldNotMatch() |
310 | { | 310 | { |
311 | UUID uuid1 = UUID.Random(); | 311 | UUID uuid1 = UUID.Random(); |
312 | AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture); | 312 | AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero); |
313 | AssetBase expected = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture); | 313 | AssetBase expected = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture, UUID.Zero); |
314 | 314 | ||
315 | var constraint = Constraints.PropertyCompareConstraint(expected); | 315 | var constraint = Constraints.PropertyCompareConstraint(expected); |
316 | 316 | ||
@@ -321,8 +321,8 @@ namespace OpenSim.Data.Tests | |||
321 | public void AssetShouldNotMatch2() | 321 | public void AssetShouldNotMatch2() |
322 | { | 322 | { |
323 | UUID uuid1 = UUID.Random(); | 323 | UUID uuid1 = UUID.Random(); |
324 | AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture); | 324 | AssetBase actual = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, UUID.Zero); |
325 | AssetBase expected = new AssetBase(uuid1, "asset two", (sbyte)AssetType.Texture); | 325 | AssetBase expected = new AssetBase(uuid1, "asset two", (sbyte)AssetType.Texture, UUID.Zero); |
326 | 326 | ||
327 | var constraint = Constraints.PropertyCompareConstraint(expected); | 327 | var constraint = Constraints.PropertyCompareConstraint(expected); |
328 | 328 | ||
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs index c968364..3ee22c8 100644 --- a/OpenSim/Data/Tests/PropertyScrambler.cs +++ b/OpenSim/Data/Tests/PropertyScrambler.cs | |||
@@ -165,7 +165,7 @@ namespace OpenSim.Data.Tests | |||
165 | [Test] | 165 | [Test] |
166 | public void TestScramble() | 166 | public void TestScramble() |
167 | { | 167 | { |
168 | AssetBase actual = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture); | 168 | AssetBase actual = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture, UUID.Zero); |
169 | new PropertyScrambler<AssetBase>().Scramble(actual); | 169 | new PropertyScrambler<AssetBase>().Scramble(actual); |
170 | } | 170 | } |
171 | 171 | ||
@@ -173,7 +173,7 @@ namespace OpenSim.Data.Tests | |||
173 | public void DontScramble() | 173 | public void DontScramble() |
174 | { | 174 | { |
175 | UUID uuid = UUID.Random(); | 175 | UUID uuid = UUID.Random(); |
176 | AssetBase asset = new AssetBase(uuid, "asset", (sbyte)AssetType.Texture); | 176 | AssetBase asset = new AssetBase(uuid, "asset", (sbyte)AssetType.Texture, UUID.Zero); |
177 | new PropertyScrambler<AssetBase>() | 177 | new PropertyScrambler<AssetBase>() |
178 | .DontScramble(x => x.Metadata) | 178 | .DontScramble(x => x.Metadata) |
179 | .DontScramble(x => x.FullID) | 179 | .DontScramble(x => x.FullID) |
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 | } |
diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs index 058b442..7806c1f 100644 --- a/OpenSim/Framework/AssetLandmark.cs +++ b/OpenSim/Framework/AssetLandmark.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Framework | |||
38 | public int Version; | 38 | public int Version; |
39 | 39 | ||
40 | public AssetLandmark(AssetBase a) | 40 | public AssetLandmark(AssetBase a) |
41 | : base(a.FullID, a.Name, a.Type) | 41 | : base(a.FullID, a.Name, a.Type, a.Metadata.CreatorID) |
42 | { | 42 | { |
43 | Data = a.Data; | 43 | Data = a.Data; |
44 | Description = a.Description; | 44 | Description = a.Description; |
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 6ab1b58..458dfdc 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | |||
@@ -41,11 +41,12 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
41 | { | 41 | { |
42 | public class AssetLoaderFileSystem : IAssetLoader | 42 | public class AssetLoaderFileSystem : IAssetLoader |
43 | { | 43 | { |
44 | private static readonly UUID LIBRARY_OWNER_ID = new UUID("11111111-1111-0000-0000-000100bba000"); | ||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 46 | ||
46 | protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type) | 47 | protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type) |
47 | { | 48 | { |
48 | AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type); | 49 | AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID); |
49 | 50 | ||
50 | if (!String.IsNullOrEmpty(path)) | 51 | if (!String.IsNullOrEmpty(path)) |
51 | { | 52 | { |
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index 74c6ab0..323c94c 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
@@ -888,7 +888,7 @@ namespace OpenSim.Framework.Capabilities | |||
888 | } | 888 | } |
889 | 889 | ||
890 | AssetBase asset; | 890 | AssetBase asset; |
891 | asset = new AssetBase(assetID, assetName, assType); | 891 | asset = new AssetBase(assetID, assetName, assType, m_agentID); |
892 | asset.Data = data; | 892 | asset.Data = data; |
893 | if (AddNewAsset != null) | 893 | if (AddNewAsset != null) |
894 | AddNewAsset(asset); | 894 | AddNewAsset(asset); |
diff --git a/OpenSim/Framework/Tests/AssetBaseTest.cs b/OpenSim/Framework/Tests/AssetBaseTest.cs index 18a3e01..0f22600 100644 --- a/OpenSim/Framework/Tests/AssetBaseTest.cs +++ b/OpenSim/Framework/Tests/AssetBaseTest.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Tests | |||
67 | 67 | ||
68 | private void CheckContainsReferences(AssetType assetType, bool expected) | 68 | private void CheckContainsReferences(AssetType assetType, bool expected) |
69 | { | 69 | { |
70 | AssetBase asset = new AssetBase(UUID.Zero, String.Empty, (sbyte)assetType); | 70 | AssetBase asset = new AssetBase(UUID.Zero, String.Empty, (sbyte)assetType, UUID.Zero); |
71 | bool actual = asset.ContainsReferences; | 71 | bool actual = asset.ContainsReferences; |
72 | Assert.AreEqual(expected, actual, "Expected "+assetType+".ContainsReferences to be "+expected+" but was "+actual+"."); | 72 | Assert.AreEqual(expected, actual, "Expected "+assetType+".ContainsReferences to be "+expected+" but was "+actual+"."); |
73 | } | 73 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs index adf171e..1e03c95 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs | |||
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
197 | 197 | ||
198 | private void Initialise(UUID fileID, string fileName) | 198 | private void Initialise(UUID fileID, string fileName) |
199 | { | 199 | { |
200 | m_asset = new AssetBase(fileID, fileName, type); | 200 | m_asset = new AssetBase(fileID, fileName, type, UUID.Zero); |
201 | m_asset.Data = new byte[0]; | 201 | m_asset.Data = new byte[0]; |
202 | m_asset.Description = "empty"; | 202 | m_asset.Description = "empty"; |
203 | m_asset.Local = true; | 203 | m_asset.Local = true; |
@@ -212,6 +212,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
212 | 212 | ||
213 | public void RequestStartXfer(IClientAPI pRemoteClient) | 213 | public void RequestStartXfer(IClientAPI pRemoteClient) |
214 | { | 214 | { |
215 | m_asset.Metadata.CreatorID = pRemoteClient.AgentId; | ||
216 | |||
215 | if (!String.IsNullOrEmpty(m_asset.Name)) | 217 | if (!String.IsNullOrEmpty(m_asset.Name)) |
216 | { | 218 | { |
217 | pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name)); | 219 | pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name)); |
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index ebe93d5..1320b33 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
112 | bool storeLocal, bool tempFile) | 112 | bool storeLocal, bool tempFile) |
113 | { | 113 | { |
114 | ourClient = remoteClient; | 114 | ourClient = remoteClient; |
115 | m_asset = new AssetBase(assetID, "blank", type); | 115 | m_asset = new AssetBase(assetID, "blank", type, remoteClient.AgentId); |
116 | m_asset.Data = data; | 116 | m_asset.Data = data; |
117 | m_asset.Description = "empty"; | 117 | m_asset.Description = "empty"; |
118 | m_asset.Local = storeLocal; | 118 | m_asset.Local = storeLocal; |
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 7ac8bed..a23e8ce 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |||
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender | |||
240 | { | 240 | { |
241 | string assetID = "j2kCache_" + AssetId.ToString(); | 241 | string assetID = "j2kCache_" + AssetId.ToString(); |
242 | 242 | ||
243 | AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard); | 243 | AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard, m_scene.RegionInfo.RegionID); |
244 | layerDecodeAsset.Local = true; | 244 | layerDecodeAsset.Local = true; |
245 | layerDecodeAsset.Temporary = true; | 245 | layerDecodeAsset.Temporary = true; |
246 | 246 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 65ad703..5756d35 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -416,7 +416,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
416 | 416 | ||
417 | //m_log.DebugFormat("[INVENTORY ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); | 417 | //m_log.DebugFormat("[INVENTORY ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); |
418 | 418 | ||
419 | AssetBase asset = new AssetBase(new UUID(uuid), "RandomName", assetType); | 419 | AssetBase asset = new AssetBase(new UUID(uuid), "RandomName", assetType, UUID.Zero); |
420 | asset.Data = data; | 420 | asset.Data = data; |
421 | 421 | ||
422 | m_scene.AssetService.Store(asset); | 422 | m_scene.AssetService.Store(asset); |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs index e303a1f..664f38d 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | |||
@@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
90 | // HGAssetService dispatches it to the remote grid. | 90 | // HGAssetService dispatches it to the remote grid. |
91 | // It's not pretty, but the best that can be done while | 91 | // It's not pretty, but the best that can be done while |
92 | // not having a global naming infrastructure | 92 | // not having a global naming infrastructure |
93 | AssetBase asset1 = new AssetBase(asset.FullID, asset.Name, asset.Type); | 93 | AssetBase asset1 = new AssetBase(asset.FullID, asset.Name, asset.Type, asset.Metadata.CreatorID); |
94 | Copy(asset, asset1); | 94 | Copy(asset, asset1); |
95 | try | 95 | try |
96 | { | 96 | { |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index d242a34..eec852e 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -161,7 +161,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
161 | } | 161 | } |
162 | 162 | ||
163 | AssetBase asset = | 163 | AssetBase asset = |
164 | CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data); | 164 | CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId); |
165 | item.AssetID = asset.FullID; | 165 | item.AssetID = asset.FullID; |
166 | m_Scene.AssetService.Store(asset); | 166 | m_Scene.AssetService.Store(asset); |
167 | 167 | ||
@@ -339,7 +339,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
339 | objectGroup.GetPartName(objectGroup.RootPart.LocalId), | 339 | objectGroup.GetPartName(objectGroup.RootPart.LocalId), |
340 | objectGroup.GetPartDescription(objectGroup.RootPart.LocalId), | 340 | objectGroup.GetPartDescription(objectGroup.RootPart.LocalId), |
341 | (sbyte)AssetType.Object, | 341 | (sbyte)AssetType.Object, |
342 | Utils.StringToBytes(sceneObjectXml)); | 342 | Utils.StringToBytes(sceneObjectXml), |
343 | objectGroup.OwnerID); | ||
343 | m_Scene.AssetService.Store(asset); | 344 | m_Scene.AssetService.Store(asset); |
344 | assetID = asset.FullID; | 345 | assetID = asset.FullID; |
345 | 346 | ||
@@ -640,9 +641,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
640 | /// <param name="assetType"></param> | 641 | /// <param name="assetType"></param> |
641 | /// <param name="data"></param> | 642 | /// <param name="data"></param> |
642 | /// <returns></returns> | 643 | /// <returns></returns> |
643 | private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data) | 644 | private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID) |
644 | { | 645 | { |
645 | AssetBase asset = new AssetBase(UUID.Random(), name, assetType); | 646 | AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID); |
646 | asset.Description = description; | 647 | asset.Description = description; |
647 | asset.Data = (data == null) ? new byte[1] : data; | 648 | asset.Data = (data == null) ? new byte[1] : data; |
648 | 649 | ||
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index e3c7bbf..367068e 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -309,7 +309,8 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
309 | } | 309 | } |
310 | 310 | ||
311 | // Create a new asset for user | 311 | // Create a new asset for user |
312 | AssetBase asset = new AssetBase(UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture); | 312 | AssetBase asset = new AssetBase(UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture, |
313 | scene.RegionInfo.RegionID); | ||
313 | asset.Data = assetData; | 314 | asset.Data = assetData; |
314 | asset.Description = String.Format("URL image : {0}", Url); | 315 | asset.Description = String.Format("URL image : {0}", Url); |
315 | asset.Local = false; | 316 | asset.Local = false; |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 59a1b8f..c4b1817 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -335,7 +335,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
335 | 335 | ||
336 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); | 336 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); |
337 | 337 | ||
338 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType); | 338 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero); |
339 | asset.Data = data; | 339 | asset.Data = data; |
340 | 340 | ||
341 | // We're relying on the asset service to do the sensible thing and not store the asset if it already | 341 | // We're relying on the asset service to do the sensible thing and not store the asset if it already |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs index 2d2c570..8601cae 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs | |||
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
158 | 158 | ||
159 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); | 159 | m_log.DebugFormat("[ARCHIVER]: Importing asset {0}", filename); |
160 | 160 | ||
161 | AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType); | 161 | AssetBase asset = new AssetBase(new UUID(filename), metadata.Name, metadata.AssetType, UUID.Zero); |
162 | asset.Description = metadata.Description; | 162 | asset.Description = metadata.Description; |
163 | asset.Data = data; | 163 | asset.Data = data; |
164 | 164 | ||
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs index 2ff635b..d10d4d6 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
52 | 52 | ||
53 | public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) | 53 | public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) |
54 | { | 54 | { |
55 | m_asset = new AssetBase(UUID.Zero, pClientFilename, type); | 55 | m_asset = new AssetBase(UUID.Zero, pClientFilename, type, pRemoteClient.AgentId); |
56 | m_asset.Data = new byte[0]; | 56 | m_asset.Data = new byte[0]; |
57 | m_asset.Description = "empty"; | 57 | m_asset.Description = "empty"; |
58 | m_asset.Local = true; | 58 | m_asset.Local = true; |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 44a651f..6ae75a8 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1080,7 +1080,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1080 | AssetBase asset = new AssetBase( | 1080 | AssetBase asset = new AssetBase( |
1081 | m_scene.RegionInfo.RegionSettings.TerrainImageID, | 1081 | m_scene.RegionInfo.RegionSettings.TerrainImageID, |
1082 | "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(), | 1082 | "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(), |
1083 | (sbyte)AssetType.Texture); | 1083 | (sbyte)AssetType.Texture, |
1084 | m_scene.RegionInfo.RegionID); | ||
1084 | asset.Data = data; | 1085 | asset.Data = data; |
1085 | asset.Description = m_scene.RegionInfo.RegionName; | 1086 | asset.Description = m_scene.RegionInfo.RegionName; |
1086 | asset.Temporary = temporary; | 1087 | asset.Temporary = temporary; |
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 712dcc7..1eef8d0 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
384 | } | 384 | } |
385 | } | 385 | } |
386 | 386 | ||
387 | AssetBase Animasset = new AssetBase(UUID.Random(), "Random Animation", (sbyte)AssetType.Animation); | 387 | AssetBase Animasset = new AssetBase(UUID.Random(), "Random Animation", (sbyte)AssetType.Animation, m_scenePresence.UUID); |
388 | Animasset.Data = anim.ToBytes(); | 388 | Animasset.Data = anim.ToBytes(); |
389 | Animasset.Temporary = true; | 389 | Animasset.Temporary = true; |
390 | Animasset.Local = true; | 390 | Animasset.Local = true; |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index ded001b..7928811 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
192 | return new ArrayList(); | 192 | return new ArrayList(); |
193 | } | 193 | } |
194 | 194 | ||
195 | AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data); | 195 | AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data, remoteClient.AgentId); |
196 | AssetService.Store(asset); | 196 | AssetService.Store(asset); |
197 | 197 | ||
198 | if (isScriptRunning) | 198 | if (isScriptRunning) |
@@ -570,15 +570,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
570 | /// <summary> | 570 | /// <summary> |
571 | /// Create a new asset data structure. | 571 | /// Create a new asset data structure. |
572 | /// </summary> | 572 | /// </summary> |
573 | /// <param name="name"></param> | 573 | private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID) |
574 | /// <param name="description"></param> | ||
575 | /// <param name="invType"></param> | ||
576 | /// <param name="assetType"></param> | ||
577 | /// <param name="data"></param> | ||
578 | /// <returns></returns> | ||
579 | private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data) | ||
580 | { | 574 | { |
581 | AssetBase asset = new AssetBase(UUID.Random(), name, assetType); | 575 | AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID); |
582 | asset.Description = description; | 576 | asset.Description = description; |
583 | asset.Data = (data == null) ? new byte[1] : data; | 577 | asset.Data = (data == null) ? new byte[1] : data; |
584 | 578 | ||
@@ -704,7 +698,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
704 | data = Encoding.ASCII.GetBytes(strdata); | 698 | data = Encoding.ASCII.GetBytes(strdata); |
705 | } | 699 | } |
706 | 700 | ||
707 | AssetBase asset = CreateAsset(name, description, assetType, data); | 701 | AssetBase asset = CreateAsset(name, description, assetType, data, remoteClient.AgentId); |
708 | AssetService.Store(asset); | 702 | AssetService.Store(asset); |
709 | 703 | ||
710 | CreateNewInventoryItem(remoteClient, remoteClient.AgentId.ToString(), folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate); | 704 | CreateNewInventoryItem(remoteClient, remoteClient.AgentId.ToString(), folderID, asset.Name, 0, callbackID, asset, invType, nextOwnerMask, creationDate); |
@@ -1289,7 +1283,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1289 | itemBase.InvType, part.UUID, remoteClient.AgentId)) | 1283 | itemBase.InvType, part.UUID, remoteClient.AgentId)) |
1290 | return; | 1284 | return; |
1291 | 1285 | ||
1292 | AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}")); | 1286 | AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, |
1287 | Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"), | ||
1288 | remoteClient.AgentId); | ||
1293 | AssetService.Store(asset); | 1289 | AssetService.Store(asset); |
1294 | 1290 | ||
1295 | TaskInventoryItem taskItem = new TaskInventoryItem(); | 1291 | TaskInventoryItem taskItem = new TaskInventoryItem(); |
@@ -1583,7 +1579,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1583 | objectGroup.GetPartName(objectGroup.LocalId), | 1579 | objectGroup.GetPartName(objectGroup.LocalId), |
1584 | objectGroup.GetPartDescription(objectGroup.LocalId), | 1580 | objectGroup.GetPartDescription(objectGroup.LocalId), |
1585 | (sbyte)AssetType.Object, | 1581 | (sbyte)AssetType.Object, |
1586 | Utils.StringToBytes(sceneObjectXml)); | 1582 | Utils.StringToBytes(sceneObjectXml), |
1583 | remoteClient.AgentId); | ||
1587 | AssetService.Store(asset); | 1584 | AssetService.Store(asset); |
1588 | 1585 | ||
1589 | item.AssetID = asset.FullID; | 1586 | item.AssetID = asset.FullID; |
@@ -1630,7 +1627,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1630 | grp.GetPartName(grp.LocalId), | 1627 | grp.GetPartName(grp.LocalId), |
1631 | grp.GetPartDescription(grp.LocalId), | 1628 | grp.GetPartDescription(grp.LocalId), |
1632 | (sbyte)AssetType.Object, | 1629 | (sbyte)AssetType.Object, |
1633 | Utils.StringToBytes(sceneObjectXml)); | 1630 | Utils.StringToBytes(sceneObjectXml), |
1631 | remoteClient.AgentId); | ||
1634 | AssetService.Store(asset); | 1632 | AssetService.Store(asset); |
1635 | 1633 | ||
1636 | InventoryItemBase item = new InventoryItemBase(); | 1634 | InventoryItemBase item = new InventoryItemBase(); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 72ece10..d5ceda8 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4389,7 +4389,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
4389 | group.GetPartName(localID), | 4389 | group.GetPartName(localID), |
4390 | group.GetPartDescription(localID), | 4390 | group.GetPartDescription(localID), |
4391 | (sbyte)AssetType.Object, | 4391 | (sbyte)AssetType.Object, |
4392 | Utils.StringToBytes(sceneObjectXml)); | 4392 | Utils.StringToBytes(sceneObjectXml), |
4393 | group.OwnerID); | ||
4393 | AssetService.Store(asset); | 4394 | AssetService.Store(asset); |
4394 | 4395 | ||
4395 | InventoryItemBase item = new InventoryItemBase(); | 4396 | InventoryItemBase item = new InventoryItemBase(); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs index a36c4db..6686264 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
58 | TestHelper.InMethod(); | 58 | TestHelper.InMethod(); |
59 | 59 | ||
60 | UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); | 60 | UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); |
61 | AssetBase corruptAsset = AssetHelpers.CreateAsset(corruptAssetUuid, "CORRUPT ASSET"); | 61 | AssetBase corruptAsset = AssetHelpers.CreateAsset(corruptAssetUuid, "CORRUPT ASSET", UUID.Zero); |
62 | m_assetService.Store(corruptAsset); | 62 | m_assetService.Store(corruptAsset); |
63 | 63 | ||
64 | IDictionary<UUID, int> foundAssetUuids = new Dictionary<UUID, int>(); | 64 | IDictionary<UUID, int> foundAssetUuids = new Dictionary<UUID, int>(); |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs index 8ea7ad3..4a5248b 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Graphics.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
49 | 49 | ||
50 | public UUID SaveBitmap(Bitmap data, bool lossless, bool temporary) | 50 | public UUID SaveBitmap(Bitmap data, bool lossless, bool temporary) |
51 | { | 51 | { |
52 | AssetBase asset = new AssetBase(UUID.Random(), "MRMDynamicImage", (sbyte)AssetType.Texture); | 52 | AssetBase asset = new AssetBase(UUID.Random(), "MRMDynamicImage", (sbyte)AssetType.Texture, m_scene.RegionInfo.RegionID); |
53 | asset.Data = OpenJPEG.EncodeFromImage(data, lossless); | 53 | asset.Data = OpenJPEG.EncodeFromImage(data, lossless); |
54 | asset.Description = "MRM Image"; | 54 | asset.Description = "MRM Image"; |
55 | asset.Local = false; | 55 | asset.Local = false; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index fccd07e..68764e1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1474,7 +1474,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1474 | m_host.AddScriptLPS(1); | 1474 | m_host.AddScriptLPS(1); |
1475 | 1475 | ||
1476 | // Create new asset | 1476 | // Create new asset |
1477 | AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard); | 1477 | AssetBase asset = new AssetBase(UUID.Random(), notecardName, (sbyte)AssetType.Notecard, m_host.OwnerID); |
1478 | asset.Description = "Script Generated Notecard"; | 1478 | asset.Description = "Script Generated Notecard"; |
1479 | string notecardData = String.Empty; | 1479 | string notecardData = String.Empty; |
1480 | 1480 | ||
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 6d442b7..876e7ed 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
@@ -243,7 +243,7 @@ namespace OpenSim.Services.Connectors | |||
243 | if (metadata == null) | 243 | if (metadata == null) |
244 | return false; | 244 | return false; |
245 | 245 | ||
246 | asset = new AssetBase(metadata.FullID, metadata.Name, metadata.Type); | 246 | asset = new AssetBase(metadata.FullID, metadata.Name, metadata.Type, UUID.Zero); |
247 | asset.Metadata = metadata; | 247 | asset.Metadata = metadata; |
248 | } | 248 | } |
249 | asset.Data = data; | 249 | asset.Data = data; |
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 608228d..bbe4a94 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -131,7 +131,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
131 | Bitmap m = new Bitmap(filename + ".jpg"); | 131 | Bitmap m = new Bitmap(filename + ".jpg"); |
132 | //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); | 132 | //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); |
133 | byte[] imageData = OpenJPEG.EncodeFromImage(m, true); | 133 | byte[] imageData = OpenJPEG.EncodeFromImage(m, true); |
134 | AssetBase ass = new AssetBase(UUID.Random(), "region " + filename, (sbyte)AssetType.Texture); | 134 | AssetBase ass = new AssetBase(UUID.Random(), "region " + filename, (sbyte)AssetType.Texture, regionID); |
135 | 135 | ||
136 | // !!! for now | 136 | // !!! for now |
137 | //info.RegionSettings.TerrainImageID = ass.FullID; | 137 | //info.RegionSettings.TerrainImageID = ass.FullID; |
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs index 1188b62..98de514 100644 --- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs | |||
@@ -38,12 +38,9 @@ namespace OpenSim.Tests.Common | |||
38 | /// <summary> | 38 | /// <summary> |
39 | /// Create an asset from the given data | 39 | /// Create an asset from the given data |
40 | /// </summary> | 40 | /// </summary> |
41 | /// <param name="assetUuid"></param> | 41 | public static AssetBase CreateAsset(UUID assetUuid, string data, UUID creatorID) |
42 | /// <param name="data"></param> | ||
43 | /// <returns></returns> | ||
44 | public static AssetBase CreateAsset(UUID assetUuid, string data) | ||
45 | { | 42 | { |
46 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object); | 43 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, creatorID); |
47 | asset.Data = Encoding.ASCII.GetBytes(data); | 44 | asset.Data = Encoding.ASCII.GetBytes(data); |
48 | return asset; | 45 | return asset; |
49 | } | 46 | } |
@@ -56,7 +53,7 @@ namespace OpenSim.Tests.Common | |||
56 | /// <returns></returns> | 53 | /// <returns></returns> |
57 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) | 54 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) |
58 | { | 55 | { |
59 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object); | 56 | AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, sog.OwnerID); |
60 | asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog)); | 57 | asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog)); |
61 | return asset; | 58 | return asset; |
62 | } | 59 | } |