diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 9 |
2 files changed, 6 insertions, 5 deletions
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 | ||