diff options
author | diva | 2009-02-09 22:27:27 +0000 |
---|---|---|
committer | diva | 2009-02-09 22:27:27 +0000 |
commit | 2c685bff1493451849580cfb6bf44b88322bf0a4 (patch) | |
tree | 4179700c2b1fcbcc7a5ab07f7bc65b3bf97a79d9 /OpenSim/Region/Framework/Interfaces | |
parent | Thank you kindly, TLaukkan (Timmil) for a patch that: (diff) | |
download | opensim-SC_OLD-2c685bff1493451849580cfb6bf44b88322bf0a4.zip opensim-SC_OLD-2c685bff1493451849580cfb6bf44b88322bf0a4.tar.gz opensim-SC_OLD-2c685bff1493451849580cfb6bf44b88322bf0a4.tar.bz2 opensim-SC_OLD-2c685bff1493451849580cfb6bf44b88322bf0a4.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IInterregionComms.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISceneObject.cs | 16 |
2 files changed, 19 insertions, 0 deletions
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 | |||
70 | /// <param name="id"></param> | 70 | /// <param name="id"></param> |
71 | /// <returns></returns> | 71 | /// <returns></returns> |
72 | bool SendCloseAgent(ulong regionHandle, UUID id); | 72 | bool SendCloseAgent(ulong regionHandle, UUID id); |
73 | |||
74 | bool SendCreateObject(ulong regionHandle, ISceneObject sog); | ||
75 | |||
73 | } | 76 | } |
74 | 77 | ||
75 | // This may not be needed, but having it here for now. | 78 | // 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 @@ | |||
1 | using System; | ||
2 | using OpenMetaverse; | ||
3 | |||
4 | namespace OpenSim.Region.Framework.Interfaces | ||
5 | { | ||
6 | public interface ISceneObject | ||
7 | { | ||
8 | UUID UUID { get; } | ||
9 | ISceneObject CloneForNewScene(); | ||
10 | string ToXmlString2(); | ||
11 | string ExtraToXmlString(); | ||
12 | void ExtraFromXmlString(string xmlstr); | ||
13 | string GetStateSnapshot(); | ||
14 | void SetState(string xmlstr, UUID regionID); | ||
15 | } | ||
16 | } | ||