aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs16
1 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 57850c1..709dd78 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -489,32 +489,38 @@ namespace OpenSim.Tests.Common.Setup
489 /// <returns></returns> 489 /// <returns></returns>
490 public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId) 490 public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId)
491 { 491 {
492 return CreateSceneObject(parts, ownerId, 0x1); 492 return CreateSceneObject(parts, ownerId, "", 0x1);
493 } 493 }
494 494
495 /// <summary> 495 /// <summary>
496 /// Create a scene object but do not add it to the scene. 496 /// Create a scene object but do not add it to the scene.
497 /// </summary> 497 /// </summary>
498 /// <param name="parts">The number of parts that should be in the scene object</param> 498 /// <param name="parts">
499 /// The number of parts that should be in the scene object
500 /// </param>
499 /// <param name="ownerId"></param> 501 /// <param name="ownerId"></param>
502 /// <param name="partNamePrefix">
503 /// The prefix to be given to part names. This will be suffixed with "Part<part no>"
504 /// (e.g. mynamePart0 for the root part)
505 /// </param>
500 /// <param name="uuidTail"> 506 /// <param name="uuidTail">
501 /// The hexadecimal last part of the UUID for parts created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}" 507 /// The hexadecimal last part of the UUID for parts created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}"
502 /// will be given to the root part, and incremented for each part thereafter. 508 /// will be given to the root part, and incremented for each part thereafter.
503 /// </param> 509 /// </param>
504 /// <returns></returns> 510 /// <returns></returns>
505 public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, int uuidTail) 511 public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, string partNamePrefix, int uuidTail)
506 { 512 {
507 string rawSogId = string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail); 513 string rawSogId = string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail);
508 514
509 SceneObjectGroup sog 515 SceneObjectGroup sog
510 = new SceneObjectGroup( 516 = new SceneObjectGroup(
511 CreateSceneObjectPart("part0", new UUID(rawSogId), ownerId)); 517 CreateSceneObjectPart(string.Format("{0}Part0", partNamePrefix), new UUID(rawSogId), ownerId));
512 518
513 if (parts > 1) 519 if (parts > 1)
514 for (int i = 1; i < parts; i++) 520 for (int i = 1; i < parts; i++)
515 sog.AddPart( 521 sog.AddPart(
516 CreateSceneObjectPart( 522 CreateSceneObjectPart(
517 string.Format("obj{0}", i), 523 string.Format("{0}Part{1}", partNamePrefix, i),
518 new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail + i)), 524 new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail + i)),
519 ownerId)); 525 ownerId));
520 526