aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-01 23:41:29 +0100
committerJustin Clark-Casey (justincc)2011-08-01 23:41:29 +0100
commit59f548cda82facef003fb7309180412254a234a1 (patch)
treeee736eca64d23b35dbd3aa0e18f1b2311804ff43 /OpenSim/Tests/Common
parentMove common gemo/agent map name code into CreateGeom() (diff)
downloadopensim-SC_OLD-59f548cda82facef003fb7309180412254a234a1.zip
opensim-SC_OLD-59f548cda82facef003fb7309180412254a234a1.tar.gz
opensim-SC_OLD-59f548cda82facef003fb7309180412254a234a1.tar.bz2
opensim-SC_OLD-59f548cda82facef003fb7309180412254a234a1.tar.xz
Get osNpcCreate appearance working with avatars that are currently in the scene.
Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing). Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing. Extended TestCreate() to check this.
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Helpers/AssetHelpers.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
index 9b68331..99eb124 100644
--- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common
42 /// <returns></returns> 42 /// <returns></returns>
43 public static AssetBase CreateAsset() 43 public static AssetBase CreateAsset()
44 { 44 {
45 return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", UUID.Random()); 45 return CreateAsset(UUID.Random());
46 } 46 }
47 47
48 /// <summary> 48 /// <summary>
@@ -50,9 +50,9 @@ namespace OpenSim.Tests.Common
50 /// </summary> 50 /// </summary>
51 /// <param name="creatorId">/param> 51 /// <param name="creatorId">/param>
52 /// <returns></returns> 52 /// <returns></returns>
53 public static AssetBase CreateAsset(UUID creatorId) 53 public static AssetBase CreateAsset(UUID id)
54 { 54 {
55 return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); 55 return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random());
56 } 56 }
57 57
58 /// <summary> 58 /// <summary>