aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-01-03 19:42:26 +0000
committerMelanie2011-01-03 19:42:26 +0000
commite1664b8d3812c20bb83f465583ffd153dafc98cd (patch)
tree3b3c77ba5cd1f47c320b32cc069a83e2c0cb84a8 /OpenSim/Region/Framework/Scenes
parentFix scoping for prim region crossings (diff)
downloadopensim-SC_OLD-e1664b8d3812c20bb83f465583ffd153dafc98cd.zip
opensim-SC_OLD-e1664b8d3812c20bb83f465583ffd153dafc98cd.tar.gz
opensim-SC_OLD-e1664b8d3812c20bb83f465583ffd153dafc98cd.tar.bz2
opensim-SC_OLD-e1664b8d3812c20bb83f465583ffd153dafc98cd.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 88e084e..69ebe9e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Framework.Scenes
193 } 193 }
194 } 194 }
195 195
196 public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, ulong regionHandle); 196 public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, UUID scopeID, ulong regionHandle);
197 197
198 /// <summary> 198 /// <summary>
199 /// This informs all neighboring regions about the settings of it's child agent. 199 /// This informs all neighboring regions about the settings of it's child agent.
@@ -202,7 +202,7 @@ namespace OpenSim.Region.Framework.Scenes
202 /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc. 202 /// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc.
203 /// 203 ///
204 /// </summary> 204 /// </summary>
205 private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, ulong regionHandle) 205 private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, UUID scopeID, ulong regionHandle)
206 { 206 {
207 //m_log.Info("[INTERGRID]: Informing neighbors about my agent in " + m_regionInfo.RegionName); 207 //m_log.Info("[INTERGRID]: Informing neighbors about my agent in " + m_regionInfo.RegionName);
208 try 208 try
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Framework.Scenes
245 if (regionHandle != m_regionInfo.RegionHandle) 245 if (regionHandle != m_regionInfo.RegionHandle)
246 { 246 {
247 SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync; 247 SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
248 d.BeginInvoke(cAgentData, regionHandle, 248 d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, regionHandle,
249 SendChildAgentDataUpdateCompleted, 249 SendChildAgentDataUpdateCompleted,
250 d); 250 d);
251 } 251 }
@@ -273,7 +273,7 @@ namespace OpenSim.Region.Framework.Scenes
273 //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); 273 //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID);
274 uint x = 0, y = 0; 274 uint x = 0, y = 0;
275 Utils.LongToUInts(regionHandle, out x, out y); 275 Utils.LongToUInts(regionHandle, out x, out y);
276 GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); 276 GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y);
277 m_scene.SimulationService.CloseAgent(destination, agentID); 277 m_scene.SimulationService.CloseAgent(destination, agentID);
278 } 278 }
279 279