aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-30 08:01:47 +0000
committerTeravus Ovares2008-03-30 08:01:47 +0000
commitfd2caf5f1673ad14702d89db9804f841c5cb861a (patch)
tree18fd4ae03180b14df41f93544afa0cc9d5ec5309 /OpenSim/Region/Communications/Local/LocalBackEndServices.cs
parent* Stop the grid inventory service sending all folder and item details twice (diff)
downloadopensim-SC-fd2caf5f1673ad14702d89db9804f841c5cb861a.zip
opensim-SC-fd2caf5f1673ad14702d89db9804f841c5cb861a.tar.gz
opensim-SC-fd2caf5f1673ad14702d89db9804f841c5cb861a.tar.bz2
opensim-SC-fd2caf5f1673ad14702d89db9804f841c5cb861a.tar.xz
This update has good news and bad news, first the bad.
* This update breaks inter-region communications, sorry. * You will need to run prebuild. Next, the good; * This update solves the unexpected binary element when Linux simulators inform windows simulators and vice versa. So Linux Simulators and Windows simulators are 100% compatible again. * This update introduces an Integer in the prim crossing method to tell the receiving simulator which XML method to use to load the prim that crossed the border. If the receiving prim doesn't support the method, the prim crossing fails and no prims are lost. That being said, it's best to update all your simulators to this revision at once.
Diffstat (limited to 'OpenSim/Region/Communications/Local/LocalBackEndServices.cs')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs14
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index de891a2..f5a5e83 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -225,6 +225,12 @@ namespace OpenSim.Region.Communications.Local
225 public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) 225 public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
226 { 226 {
227 RegionInfo region = new RegionInfo(sregion); 227 RegionInfo region = new RegionInfo(sregion);
228
229 //region.RegionLocX = sregion.X;
230 //region.RegionLocY = sregion.Y;
231 //region.SetEndPoint(sregion.IPADDR, sregion.PORT);
232
233 //sregion);
228 if (m_regionListeners.ContainsKey(regionhandle)) 234 if (m_regionListeners.ContainsKey(regionhandle))
229 { 235 {
230 return m_regionListeners[regionhandle].TriggerRegionUp(region); 236 return m_regionListeners[regionhandle].TriggerRegionUp(region);
@@ -316,11 +322,11 @@ namespace OpenSim.Region.Communications.Local
316 return false; 322 return false;
317 } 323 }
318 324
319 public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData) 325 public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
320 { 326 {
321 if (m_regionListeners.ContainsKey(regionHandle)) 327 if (m_regionListeners.ContainsKey(regionHandle))
322 { 328 {
323 m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData); 329 m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData, XMLMethod);
324 return true; 330 return true;
325 } 331 }
326 return false; 332 return false;
@@ -408,11 +414,11 @@ namespace OpenSim.Region.Communications.Local
408 } 414 }
409 } 415 }
410 416
411 public void TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData) 417 public void TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
412 { 418 {
413 if (m_regionListeners.ContainsKey(regionHandle)) 419 if (m_regionListeners.ContainsKey(regionHandle))
414 { 420 {
415 m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData); 421 m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData, XMLMethod);
416 } 422 }
417 } 423 }
418 424