diff options
author | Justin Clark-Casey (justincc) | 2012-07-13 00:44:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-13 00:44:00 +0100 |
commit | 9ccb5787211f81c1c2059aa4b889f68cd460b539 (patch) | |
tree | 367d0127c8fb202d8ac7c929e48a9f5179600e39 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour | |
parent | Stop redundantly passing in the endpoint to the LLClientView constructor. (diff) | |
download | opensim-SC_OLD-9ccb5787211f81c1c2059aa4b889f68cd460b539.zip opensim-SC_OLD-9ccb5787211f81c1c2059aa4b889f68cd460b539.tar.gz opensim-SC_OLD-9ccb5787211f81c1c2059aa4b889f68cd460b539.tar.bz2 opensim-SC_OLD-9ccb5787211f81c1c2059aa4b889f68cd460b539.tar.xz |
Don't cache regions data on the other unused LocalGridServiceConnector that the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector.
Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs index 40cc536..7a90686 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs | |||
@@ -125,13 +125,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | |||
125 | uint x, y; | 125 | uint x, y; |
126 | Utils.LongToUInts(regionHandle, out x, out y); | 126 | Utils.LongToUInts(regionHandle, out x, out y); |
127 | 127 | ||
128 | m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from region {0} to region at {1}-{2}", | ||
129 | thisRegion.RegionName, x / Constants.RegionSize, y / Constants.RegionSize); | ||
130 | |||
131 | foreach (Scene s in m_Scenes) | 128 | foreach (Scene s in m_Scenes) |
132 | { | 129 | { |
133 | if (s.RegionInfo.RegionHandle == regionHandle) | 130 | if (s.RegionInfo.RegionHandle == regionHandle) |
134 | { | 131 | { |
132 | m_log.DebugFormat("[LOCAL NEIGHBOUR SERVICE CONNECTOR]: HelloNeighbour from region {0} to neighbour {1} at {2}-{3}", | ||
133 | thisRegion.RegionName, s.Name, x / Constants.RegionSize, y / Constants.RegionSize); | ||
134 | |||
135 | //m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour"); | 135 | //m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour"); |
136 | return s.IncomingHelloNeighbour(thisRegion); | 136 | return s.IncomingHelloNeighbour(thisRegion); |
137 | } | 137 | } |