diff options
Diffstat (limited to '')
10 files changed, 16 insertions, 13 deletions
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 08dfb75..f5eda3a 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -347,7 +347,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
347 | 347 | ||
348 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); | 348 | //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType); |
349 | 349 | ||
350 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType); | 350 | AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero); |
351 | asset.Data = data; | 351 | asset.Data = data; |
352 | 352 | ||
353 | // We're relying on the asset service to do the sensible thing and not store the asset if it already | 353 | // 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; |