aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-10 00:46:56 +0000
committerTeravus Ovares2007-12-10 00:46:56 +0000
commite595f82489ae91c2a913f2ac8445b3d5dbe160d0 (patch)
tree3c4c3ca6c42fefb3904f8eb211bfb38bac52ef0d /OpenSim/Region/Communications/OGS1
parentAdded a call to m_host.SendFullUpdateToAllClients(). (diff)
downloadopensim-SC_OLD-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.zip
opensim-SC_OLD-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.tar.gz
opensim-SC_OLD-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.tar.bz2
opensim-SC_OLD-e595f82489ae91c2a913f2ac8445b3d5dbe160d0.tar.xz
* Hooked up the GridComm event ChildDataUpdate to the scene.
* Added List<RegionInfo> m_neighbours to Scene * Hooked up the OnRegionUp event to m_neighbours list * Modified RegionInfo to have a bool commFailTF value so that we can skip neighbors that fail. (when the region comes up, this gets reset to false and the region will try again. * Added SetChildAgentThrottle(byte[]) to IClientAPI * Several other insignificant changes related to passing child pertanant agent data from sim to sim.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index c556188..fbb83fc 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -710,9 +710,10 @@ namespace OpenSim.Region.Communications.OGS1
710 } 710 }
711 catch (Exception e) 711 catch (Exception e)
712 { 712 {
713 MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + 713 // This line errors with a Null Reference Exception.. Why? @.@
714 ":" + regInfo.RemotingPort + 714 //MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress +
715 "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one"); 715 // ":" + regInfo.RemotingPort +
716 //"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one");
716 MainLog.Instance.Debug(e.ToString()); 717 MainLog.Instance.Debug(e.ToString());
717 return false; 718 return false;
718 } 719 }