diff options
author | MW | 2007-07-10 20:52:43 +0000 |
---|---|---|
committer | MW | 2007-07-10 20:52:43 +0000 |
commit | f0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6 (patch) | |
tree | d7f269f36b7f29e980b9f70ebe273569afb964c6 /OpenSim/Framework | |
parent | Fixed the crashing when trying to look at the map in grid mode. Although the ... (diff) | |
download | opensim-SC-f0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6.zip opensim-SC-f0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6.tar.gz opensim-SC-f0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6.tar.bz2 opensim-SC-f0ecc1de4ccb40ed23b5bc925130bda3ff07c1a6.tar.xz |
preliminary inter region communications (between regions in different instances) now works, so child agents and border crossings (and teleporting) now work.
The .net remoting is still very basic: we need security sinks added.
And we really need the OGS 2 protocol as soon as possible.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/General/Types/AgentCiruitData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/RegionInfo.cs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/General/Types/AgentCiruitData.cs b/OpenSim/Framework/General/Types/AgentCiruitData.cs index 00e9d0a..ed9ee3c 100644 --- a/OpenSim/Framework/General/Types/AgentCiruitData.cs +++ b/OpenSim/Framework/General/Types/AgentCiruitData.cs | |||
@@ -26,9 +26,11 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using libsecondlife; | 28 | using libsecondlife; |
29 | using System; | ||
29 | 30 | ||
30 | namespace OpenSim.Framework.Types | 31 | namespace OpenSim.Framework.Types |
31 | { | 32 | { |
33 | [Serializable] | ||
32 | public class AgentCircuitData | 34 | public class AgentCircuitData |
33 | { | 35 | { |
34 | public AgentCircuitData() { } | 36 | public AgentCircuitData() { } |
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs index 72d1a4c..cfc0925 100644 --- a/OpenSim/Framework/General/Types/RegionInfo.cs +++ b/OpenSim/Framework/General/Types/RegionInfo.cs | |||
@@ -130,6 +130,7 @@ namespace OpenSim.Framework.Types | |||
130 | m_remotingPort = value; | 130 | m_remotingPort = value; |
131 | } | 131 | } |
132 | } | 132 | } |
133 | public string RemotingAddress; | ||
133 | 134 | ||
134 | public string DataStore = ""; | 135 | public string DataStore = ""; |
135 | public bool isSandbox = false; | 136 | public bool isSandbox = false; |