aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Setup
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-13 21:17:43 +0100
committerJustin Clark-Casey (justincc)2011-04-13 21:17:43 +0100
commit58efd761d13bd4f2617fcb3f94bbe265880589e3 (patch)
tree4900fbec5e577c48b42efeb10115fd64dc47681b /OpenSim/Tests/Common/Setup
parentfactor out some test code into the SetUp() (diff)
downloadopensim-SC_OLD-58efd761d13bd4f2617fcb3f94bbe265880589e3.zip
opensim-SC_OLD-58efd761d13bd4f2617fcb3f94bbe265880589e3.tar.gz
opensim-SC_OLD-58efd761d13bd4f2617fcb3f94bbe265880589e3.tar.bz2
opensim-SC_OLD-58efd761d13bd4f2617fcb3f94bbe265880589e3.tar.xz
Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test.
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc. Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item. Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place. This bug will be addressed shortly.
Diffstat (limited to 'OpenSim/Tests/Common/Setup')
-rw-r--r--OpenSim/Tests/Common/Setup/AssetHelpers.cs15
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
index ff4423f..af66d7f 100644
--- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
@@ -71,6 +71,21 @@ namespace OpenSim.Tests.Common
71 Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), 71 Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)),
72 sog.OwnerID); 72 sog.OwnerID);
73 } 73 }
74
75 /// <summary>
76 /// Create an asset from the given scene object.
77 /// </summary>
78 /// <param name="assetUuid"></param>
79 /// <param name="coa"></param>
80 /// <returns></returns>
81 public static AssetBase CreateAsset(UUID assetUuid, CoalescedSceneObjects coa)
82 {
83 return CreateAsset(
84 assetUuid,
85 AssetType.Object,
86 Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)),
87 coa.CreatorId);
88 }
74 89
75 /// <summary> 90 /// <summary>
76 /// Create an asset from the given data. 91 /// Create an asset from the given data.