diff options
author | John Hurliman | 2010-02-22 14:18:59 -0800 |
---|---|---|
committer | John Hurliman | 2010-02-22 14:18:59 -0800 |
commit | df76e95aa2dc9f3f3a0c546761b7624adc183ed0 (patch) | |
tree | 74e7cc684b12ca9b67e01e62bfcf481c1da98eb2 /OpenSim/Region/CoreModules/Framework | |
parent | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... (diff) | |
download | opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.zip opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.gz opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.bz2 opensim-SC_OLD-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.xz |
Changed asset CreatorID to a string
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index eec852e..37f1da9 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, remoteClient.AgentId); | 164 | CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString()); |
165 | item.AssetID = asset.FullID; | 165 | item.AssetID = asset.FullID; |
166 | m_Scene.AssetService.Store(asset); | 166 | m_Scene.AssetService.Store(asset); |
167 | 167 | ||
@@ -340,7 +340,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
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 | objectGroup.OwnerID.ToString()); |
344 | m_Scene.AssetService.Store(asset); | 344 | m_Scene.AssetService.Store(asset); |
345 | assetID = asset.FullID; | 345 | assetID = asset.FullID; |
346 | 346 | ||
@@ -641,7 +641,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
641 | /// <param name="assetType"></param> | 641 | /// <param name="assetType"></param> |
642 | /// <param name="data"></param> | 642 | /// <param name="data"></param> |
643 | /// <returns></returns> | 643 | /// <returns></returns> |
644 | private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID) | 644 | private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, string creatorID) |
645 | { | 645 | { |
646 | AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID); | 646 | AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID); |
647 | asset.Description = description; | 647 | asset.Description = description; |