From aaf912586948a3d0d9bb918952766ba48e90fd18 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 14 Apr 2011 17:33:55 +0100
Subject: simplify coalesced object tests by using existing scene object set up
utils
this change makes it possible to set an absolute position on a group before it is put into a scene.
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ca7d9d9..9bb50db 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -296,11 +296,14 @@ namespace OpenSim.Region.Framework.Scenes
{
Vector3 val = value;
- if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
- || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S))
- && !IsAttachmentCheckFull() && (!m_scene.LoadingPrims))
+ if (Scene != null)
{
- m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+ if ((Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
+ || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S))
+ && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
+ {
+ m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+ }
}
if (RootPart.GetStatusSandbox())
@@ -308,8 +311,11 @@ namespace OpenSim.Region.Framework.Scenes
if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
{
RootPart.ScriptSetPhysicsStatus(false);
- Scene.SimChat(Utils.StringToBytes("Hit Sandbox Limit"),
- ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false);
+
+ if (Scene != null)
+ Scene.SimChat(Utils.StringToBytes("Hit Sandbox Limit"),
+ ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false);
+
return;
}
}
@@ -326,7 +332,8 @@ namespace OpenSim.Region.Framework.Scenes
//m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor);
//}
- m_scene.EventManager.TriggerParcelPrimCountTainted();
+ if (Scene != null)
+ Scene.EventManager.TriggerParcelPrimCountTainted();
}
}
--
cgit v1.1
From a0d80140f2d0ad6dd63970a3a3d5c0da8320ae75 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Apr 2011 00:42:06 +0100
Subject: Make all the objects in a coalescence reappears after being loaded
from an IAR. This still doesn't work proprerly since some required
textures/contained item assets might be missing.
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
---
.../CoalescedSceneObjectsSerializer.cs | 47 +++++++++++++++++++---
1 file changed, 41 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index a0e120a..babcb54 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -55,11 +55,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
///
///
public static string ToXml(CoalescedSceneObjects coa)
- {
- // TODO: Should probably return an empty xml serialization rather than a blank string
- if (!coa.HasObjects)
- return "";
-
+ {
using (StringWriter sw = new StringWriter())
{
using (XmlTextWriter writer = new XmlTextWriter(sw))
@@ -105,10 +101,49 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
string output = sw.ToString();
-// m_log.Debug(output);
+// Console.WriteLine(output);
return output;
}
}
+
+ public static bool TryFromXml(string xml, out CoalescedSceneObjects coa)
+ {
+// m_log.DebugFormat("[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() deserializing {0}", xml);
+
+ coa = null;
+
+ using (StringReader sr = new StringReader(xml))
+ {
+ using (XmlTextReader reader = new XmlTextReader(sr))
+ {
+ reader.Read();
+ if (reader.Name != "CoalescedObject")
+ {
+// m_log.DebugFormat(
+// "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false",
+// reader.Name);
+
+ return false;
+ }
+
+ coa = new CoalescedSceneObjects(UUID.Zero);
+ reader.Read();
+
+ while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
+ {
+ if (reader.Name == "SceneObjectGroup")
+ {
+ string soXml = reader.ReadOuterXml();
+ coa.Add(SceneObjectSerializer.FromOriginalXmlFormat(soXml));
+ }
+ }
+
+ reader.ReadEndElement(); // CoalescedObject
+ }
+ }
+
+ return true;
+ }
}
}
\ No newline at end of file
--
cgit v1.1
From 54e885581989ddfaf525753ede12c4d4d797cba0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Apr 2011 01:23:26 +0100
Subject: remove mock asset service for tests in favour of always using the
real one
---
OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index 6b70865..dbf9e0f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -47,7 +47,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[SetUp]
public void Init()
{
- m_assetService = new MockAssetService();
+ // FIXME: We don't need a full scene here - it would be enough to set up the asset service.
+ Scene scene = SceneSetupHelpers.SetupScene();
+ m_assetService = scene.AssetService;
m_uuidGatherer = new UuidGatherer(m_assetService);
}
--
cgit v1.1
From 66a62678e5da89b0fa004eca3a370d202c239884 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Apr 2011 01:37:27 +0100
Subject: get rid of all traces of the now used mock service infrastructure
---
OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | 4 ++--
OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 8588f7f..dd28416 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -117,11 +117,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
ISharedRegionModule interregionComms = new LocalSimulationConnectorModule();
- Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, "grid");
+ Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010);
SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
sceneB.RegisterRegionWithGrid();
- Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, "grid");
+ Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000);
SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
sceneA.RegisterRegionWithGrid();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 8138bcc..2aef4b0 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.Framework.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene("inventory");
+ Scene scene = SceneSetupHelpers.SetupScene();
UserAccount user1 = CreateUser(scene);
SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
SceneObjectPart sop1 = sog1.RootPart;
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene("inventory");
+ Scene scene = SceneSetupHelpers.SetupScene();
UserAccount user1 = CreateUser(scene);
SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
SceneObjectPart sop1 = sog1.RootPart;
--
cgit v1.1