diff options
author | Teravus Ovares | 2007-11-28 06:18:07 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-28 06:18:07 +0000 |
commit | b7d596a6af51bea7dba642cdc768ac5ff77af5f3 (patch) | |
tree | 967b749b10b548f6ed687d8ade4680e411793da4 /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |
parent | build ThrottleCheck function to clear up bits of the throttle (diff) | |
download | opensim-SC-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.zip opensim-SC-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.tar.gz opensim-SC-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.tar.bz2 opensim-SC-b7d596a6af51bea7dba642cdc768ac5ff77af5f3.tar.xz |
* Restaring the sim works fine in grid mode now. Sims announce themselves to their neighbors when they start up. Neighbors get this message and tell their agents that there's a new sim up.
* Certain unrecoverable physics based crashes in ODE are now hooked up to the 'restart the sim' routine.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 9a83710..892bf81 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -171,6 +171,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
171 | } | 171 | } |
172 | } | 172 | } |
173 | 173 | ||
174 | public void RequestNeighbors(RegionInfo region) | ||
175 | { | ||
176 | List<SimpleRegionInfo> neighbours = | ||
177 | m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); | ||
178 | //IPEndPoint blah = new IPEndPoint(); | ||
179 | |||
180 | //blah.Address = region.RemotingAddress; | ||
181 | //blah.Port = region.RemotingPort; | ||
182 | |||
183 | |||
184 | } | ||
185 | |||
174 | /// <summary> | 186 | /// <summary> |
175 | /// | 187 | /// |
176 | /// </summary> | 188 | /// </summary> |
@@ -311,7 +323,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
311 | public void InformNeighborsThatRegionisUp(RegionInfo region) | 323 | public void InformNeighborsThatRegionisUp(RegionInfo region) |
312 | { | 324 | { |
313 | //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); | 325 | //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); |
314 | bool val = m_commsProvider.InterRegion.RegionUp(region); | 326 | bool val = m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region)); |
315 | } | 327 | } |
316 | 328 | ||
317 | public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical) | 329 | public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical) |