From 2c685bff1493451849580cfb6bf44b88322bf0a4 Mon Sep 17 00:00:00 2001 From: diva Date: Mon, 9 Feb 2009 22:27:27 +0000 Subject: Moved prim crossing out of OGS1 and into RESTComms and LocalInterregionComms. This breaks interregion comms with older versions in what concerns prim crossing. In the process of moving the comms, a few things seem to be working better, namely this may address mantis #3011, mantis #1698. Hopefully, this doesn't break anything else. But I'm still seeing weirdnesses with attchments jumping out of place after a cross/TP. The two most notable changes in the crossing process were: * Object gets passed in only one message, not two as done before. * Local object crossings do not get serialized, as done before. --- OpenSim/Region/Framework/Interfaces/IInterregionComms.cs | 3 +++ OpenSim/Region/Framework/Interfaces/ISceneObject.cs | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 OpenSim/Region/Framework/Interfaces/ISceneObject.cs (limited to 'OpenSim/Region/Framework/Interfaces') diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs index 783b3f9..bfa17fc 100644 --- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs +++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs @@ -70,6 +70,9 @@ namespace OpenSim.Region.Framework.Interfaces /// /// bool SendCloseAgent(ulong regionHandle, UUID id); + + bool SendCreateObject(ulong regionHandle, ISceneObject sog); + } // This may not be needed, but having it here for now. diff --git a/OpenSim/Region/Framework/Interfaces/ISceneObject.cs b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs new file mode 100644 index 0000000..79a43d6 --- /dev/null +++ b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs @@ -0,0 +1,16 @@ +using System; +using OpenMetaverse; + +namespace OpenSim.Region.Framework.Interfaces +{ + public interface ISceneObject + { + UUID UUID { get; } + ISceneObject CloneForNewScene(); + string ToXmlString2(); + string ExtraToXmlString(); + void ExtraFromXmlString(string xmlstr); + string GetStateSnapshot(); + void SetState(string xmlstr, UUID regionID); + } +} -- cgit v1.1