diff options
author | Justin Clark-Casey (justincc) | 2014-04-02 00:58:33 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-04-02 00:58:33 +0100 |
commit | 0af8886400e56cfbc2efc0d6a8ab01eb289b4e52 (patch) | |
tree | edd6ccc86d800964d27f7a034e8381f5cb03abd9 /OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |
parent | Merge branch 'master' of /home/opensim/src/opensim (diff) | |
download | opensim-SC_OLD-0af8886400e56cfbc2efc0d6a8ab01eb289b4e52.zip opensim-SC_OLD-0af8886400e56cfbc2efc0d6a8ab01eb289b4e52.tar.gz opensim-SC_OLD-0af8886400e56cfbc2efc0d6a8ab01eb289b4e52.tar.bz2 opensim-SC_OLD-0af8886400e56cfbc2efc0d6a8ab01eb289b4e52.tar.xz |
Fix problem where moving an object to another region on the same simulator was failing, with the object returning to its original position.
Root cause was that PrimLimitsModule was not properly handling the case where the parcel it was asked to check was outside the current region's bounds.
If this is the case, we can abort the check since the receiving region will perform it.
Added a regression test for this case.
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/SceneHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 584ca17..345ca8a 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -595,6 +595,32 @@ namespace OpenSim.Tests.Common | |||
595 | 595 | ||
596 | return so; | 596 | return so; |
597 | } | 597 | } |
598 | |||
599 | /// <summary> | ||
600 | /// Add a test object | ||
601 | /// </summary> | ||
602 | /// <param name="scene"></param> | ||
603 | /// <param name="parts"> | ||
604 | /// The number of parts that should be in the scene object | ||
605 | /// </param> | ||
606 | /// <param name="ownerId"></param> | ||
607 | /// <param name="partNamePrefix"> | ||
608 | /// The prefix to be given to part names. This will be suffixed with "Part<part no>" | ||
609 | /// (e.g. mynamePart1 for the root part) | ||
610 | /// </param> | ||
611 | /// <param name="uuidTail"> | ||
612 | /// The hexadecimal last part of the UUID for parts created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}" | ||
613 | /// will be given to the root part, and incremented for each part thereafter. | ||
614 | /// </param> | ||
615 | /// <returns></returns> | ||
616 | public static SceneObjectGroup AddSceneObject(Scene scene, int parts, UUID ownerId, string partNamePrefix, int uuidTail) | ||
617 | { | ||
618 | SceneObjectGroup so = CreateSceneObject(parts, ownerId, partNamePrefix, uuidTail); | ||
619 | |||
620 | scene.AddNewSceneObject(so, false); | ||
621 | |||
622 | return so; | ||
623 | } | ||
598 | 624 | ||
599 | /// <summary> | 625 | /// <summary> |
600 | /// Create a scene object part. | 626 | /// Create a scene object part. |