3 files changed, 38 insertions, 24 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
         public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
         {
             RegionInfo region = new RegionInfo(sregion);
+
+            //region.RegionLocX = sregion.X;
+            //region.RegionLocY = sregion.Y;
+            //region.SetEndPoint(sregion.IPADDR, sregion.PORT);
+
+            //sregion);
             if (m_regionListeners.ContainsKey(regionhandle))
             {
                 return m_regionListeners[regionhandle].TriggerRegionUp(region);
@@ -316,11 +322,11 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
-        public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
+        public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
-                m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData);
+                m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData, XMLMethod);
                 return true;
             }
             return false;
@@ -408,11 +414,11 @@ namespace OpenSim.Region.Communications.Local
             }
         }
 
-        public void TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData)
+        public void TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
         {
             if (m_regionListeners.ContainsKey(regionHandle))
             {
-                m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData);
+                m_regionListeners[regionHandle].TriggerExpectPrim(regionHandle, primID, objData, XMLMethod);
             }
         }
 
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index d19752c..22bb0f0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -857,6 +857,8 @@ namespace OpenSim.Region.Communications.OGS1
                 // The region asking the grid services about itself..  
                 // And, surprisingly, the reason is..  it doesn't know 
                 // it's own remoting port!  How special.
+                RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
+
                 region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle));
                 region.RemotingAddress = region.ExternalHostName;                  
                 region.RemotingPort = NetworkServersInfo.RemotingListenerPort;                
@@ -885,7 +887,7 @@ namespace OpenSim.Region.Communications.OGS1
 
                         if (remObject != null)
                         {
-                            retValue = remObject.RegionUp(region, regionhandle);
+                            retValue = remObject.RegionUp(regiondata, regionhandle);
                         }
                         else
                         {
@@ -962,7 +964,7 @@ namespace OpenSim.Region.Communications.OGS1
         /// <param name="regionHandle"></param>
         /// <param name="agentData"></param>
         /// <returns></returns>
-        public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
+        public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
         {
             int failures = 0;
             lock (m_deadRegionCache)
@@ -977,7 +979,7 @@ namespace OpenSim.Region.Communications.OGS1
                 RegionInfo regInfo = null;
                 try
                 {
-                    if (m_localBackend.InformRegionOfPrimCrossing(regionHandle, primID, objData))
+                    if (m_localBackend.InformRegionOfPrimCrossing(regionHandle, primID, objData, XMLMethod))
                     {
                         return true;
                     }
@@ -996,7 +998,7 @@ namespace OpenSim.Region.Communications.OGS1
 
                         if (remObject != null)
                         {
-                            retValue = remObject.InformRegionOfPrimCrossing(regionHandle, primID.UUID, objData);
+                            retValue = remObject.InformRegionOfPrimCrossing(regionHandle, primID.UUID, objData, XMLMethod);
                         }
                         else
                         {
@@ -1325,23 +1327,29 @@ namespace OpenSim.Region.Communications.OGS1
             }
         }
 
-        public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle)
+        public bool TriggerRegionUp(RegionUpData regionData, ulong regionhandle)
         {
             m_log.Info("[OGS1 GRID SERVICES]: " +
-                       gdebugRegionName + "Incoming OGS1 RegionUpReport:  " + "(" + regionData.RegionLocX +
-                       "," + regionData.RegionLocY + "). Giving this region a fresh set of 'dead' tries");
+                       gdebugRegionName + "Incoming OGS1 RegionUpReport:  " + "(" + regionData.X +
+                       "," + regionData.Y + "). Giving this region a fresh set of 'dead' tries");
+            RegionInfo nRegionInfo = new RegionInfo();
+            nRegionInfo.SetEndPoint("127.0.0.1", regionData.PORT);
+            nRegionInfo.ExternalHostName = regionData.IPADDR;
+            nRegionInfo.RegionLocX = regionData.X;
+            nRegionInfo.RegionLocY = regionData.Y;
 
+            
             try
             {
                 lock (m_deadRegionCache)
                 {
-                    if (m_deadRegionCache.ContainsKey(regionData.RegionHandle))
+                    if (m_deadRegionCache.ContainsKey(nRegionInfo.RegionHandle))
                     {
-                        m_deadRegionCache.Remove(regionData.RegionHandle);
+                        m_deadRegionCache.Remove(nRegionInfo.RegionHandle);
                     }
                 }
 
-                return m_localBackend.TriggerRegionUp(new RegionInfo(regionData), regionhandle);
+                return m_localBackend.TriggerRegionUp(nRegionInfo, regionhandle);
             }
 
             catch (RemotingException e)
@@ -1372,12 +1380,12 @@ namespace OpenSim.Region.Communications.OGS1
         /// <param name="regionHandle"></param>
         /// <param name="agentData"></param>
         /// <returns></returns>
-        public bool IncomingPrim(ulong regionHandle, LLUUID primID, string objData)
+        public bool IncomingPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
         {
             // Is this necessary?   
             try
             {
-                m_localBackend.TriggerExpectPrim(regionHandle, primID, objData);
+                m_localBackend.TriggerExpectPrim(regionHandle, primID, objData, XMLMethod);
                 return true;
                 //m_localBackend.
             }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index c282464..2e106d7 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -38,9 +38,9 @@ namespace OpenSim.Region.Communications.OGS1
 
     public delegate bool InformRegionPrimGroup(ulong regionHandle, LLUUID primID, LLVector3 Positon, bool isPhysical);
 
-    public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData);
+    public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData, int XMLMethod);
 
-    public delegate bool RegionUp(SearializableRegionInfo region, ulong regionhandle);
+    public delegate bool RegionUp(RegionUpData region, ulong regionhandle);
 
     public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate);
 
@@ -90,7 +90,7 @@ namespace OpenSim.Region.Communications.OGS1
             return false;
         }
 
-        public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
+        public bool RegionUp(RegionUpData sregion, ulong regionhandle)
         {
             handlerRegionUp = OnRegionUp;
             if (handlerRegionUp != null)
@@ -130,12 +130,12 @@ namespace OpenSim.Region.Communications.OGS1
             return false;
         }
 
-        public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
+        public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
         {
             handlerPrimGroupArrival = OnPrimGroupArrival;
             if (handlerPrimGroupArrival != null)
             {
-                return handlerPrimGroupArrival(regionHandle, primID, objData);
+                return handlerPrimGroupArrival(regionHandle, primID, objData, XMLMethod);
             }
             return false;
         }
@@ -173,7 +173,7 @@ namespace OpenSim.Region.Communications.OGS1
             }
         }
 
-        public bool RegionUp(SearializableRegionInfo region, ulong regionhandle)
+        public bool RegionUp(RegionUpData region, ulong regionhandle)
         {
             try
             {
@@ -232,11 +232,11 @@ namespace OpenSim.Region.Communications.OGS1
             }
         }
 
-        public bool InformRegionOfPrimCrossing(ulong regionHandle, Guid primID, string objData)
+        public bool InformRegionOfPrimCrossing(ulong regionHandle, Guid primID, string objData, int XMLMethod)
         {
             try
             {
-                return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData);
+                return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData, XMLMethod);
             }
             catch (RemotingException e)
             {