aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-12-31 16:05:59 +0100
committerMelanie2010-12-31 16:05:59 +0100
commit04e450e2bc065bd6049939129d0eacc851e014ba (patch)
tree0f994d3c2885fc221efbfd86df324b65f7869379 /OpenSim/Region/Framework/Scenes
parentFix scoping for prim region crossings (diff)
downloadopensim-SC_OLD-04e450e2bc065bd6049939129d0eacc851e014ba.zip
opensim-SC_OLD-04e450e2bc065bd6049939129d0eacc851e014ba.tar.gz
opensim-SC_OLD-04e450e2bc065bd6049939129d0eacc851e014ba.tar.bz2
opensim-SC_OLD-04e450e2bc065bd6049939129d0eacc851e014ba.tar.xz
Fix child agent scoping
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 632646d..c8af4c3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.Framework.Scenes
189 } 189 }
190 } 190 }
191 191
192 public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, ulong regionHandle); 192 public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, UUID scopeID, ulong regionHandle);
193 193
194 /// <summary> 194 /// <summary>
195 /// This informs all neighboring regions about the settings of it's child agent. 195 /// This informs all neighboring regions about the settings of it's child agent.
@@ -198,7 +198,7 @@ namespace OpenSim.Region.Framework.Scenes
198 /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc. 198 /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc.
199 /// 199 ///
200 /// </summary> 200 /// </summary>
201 private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, ulong regionHandle) 201 private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, UUID scopeID, ulong regionHandle)
202 { 202 {
203 //m_log.Info("[INTERGRID]: Informing neighbors about my agent in " + m_regionInfo.RegionName); 203 //m_log.Info("[INTERGRID]: Informing neighbors about my agent in " + m_regionInfo.RegionName);
204 try 204 try
@@ -241,7 +241,7 @@ namespace OpenSim.Region.Framework.Scenes
241 if (regionHandle != m_regionInfo.RegionHandle) 241 if (regionHandle != m_regionInfo.RegionHandle)
242 { 242 {
243 SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync; 243 SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
244 d.BeginInvoke(cAgentData, regionHandle, 244 d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, regionHandle,
245 SendChildAgentDataUpdateCompleted, 245 SendChildAgentDataUpdateCompleted,
246 d); 246 d);
247 } 247 }
@@ -269,7 +269,7 @@ namespace OpenSim.Region.Framework.Scenes
269 //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); 269 //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID);
270 uint x = 0, y = 0; 270 uint x = 0, y = 0;
271 Utils.LongToUInts(regionHandle, out x, out y); 271 Utils.LongToUInts(regionHandle, out x, out y);
272 GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); 272 GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y);
273 m_scene.SimulationService.CloseChildAgent(destination, agentID); 273 m_scene.SimulationService.CloseChildAgent(destination, agentID);
274 } 274 }
275 275