aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJohn Hurliman2010-02-22 14:18:59 -0800
committerJohn Hurliman2010-02-22 14:18:59 -0800
commitdf76e95aa2dc9f3f3a0c546761b7624adc183ed0 (patch)
tree74e7cc684b12ca9b67e01e62bfcf481c1da98eb2 /OpenSim/Region/Framework/Scenes
parentMerge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... (diff)
downloadopensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.zip
opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.gz
opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.bz2
opensim-SC-df76e95aa2dc9f3f3a0c546761b7624adc183ed0.tar.xz
Changed asset CreatorID to a string
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 1eef8d0..7307662 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, m_scenePresence.UUID); 387 AssetBase Animasset = new AssetBase(UUID.Random(), "Random Animation", (sbyte)AssetType.Animation, m_scenePresence.UUID.ToString());
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 7928811..6df25d6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -572,7 +572,7 @@ namespace OpenSim.Region.Framework.Scenes
572 /// </summary> 572 /// </summary>
573 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID) 573 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data, UUID creatorID)
574 { 574 {
575 AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID); 575 AssetBase asset = new AssetBase(UUID.Random(), name, assetType, creatorID.ToString());
576 asset.Description = description; 576 asset.Description = description;
577 asset.Data = (data == null) ? new byte[1] : data; 577 asset.Data = (data == null) ? new byte[1] : data;
578 578