6 files changed, 69 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index e7e1737..f018dd6 100644
--- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Communications
         bool Available { get; }
         void CheckRegion(string address, uint port);
         bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
-        bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData);
+        bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod);
         bool RegionUp(SearializableRegionInfo region, ulong regionhandle);
         bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData);
 
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 518659f..9dd17f9 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -302,6 +302,13 @@ namespace OpenSim.Framework
 
     public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags, LLUUID AgentID, LLUUID GroupID);
 
+    public delegate void ObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID, 
+                    LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart,
+                    bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates);
+
+                            
+                        
+
     public delegate void StatusChange(bool status);
 
     public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
@@ -463,6 +470,7 @@ namespace OpenSim.Framework
         event GodKickUser OnGodKickUser;
 
         event ObjectDuplicate OnObjectDuplicate;
+        event ObjectDuplicateOnRay OnObjectDuplicateOnRay;
         event UpdateVector OnGrabObject;
         event ObjectSelect OnDeGrabObject;
         event MoveObject OnGrabUpdate;
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
index c10353b..7726634 100644
--- a/OpenSim/Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/IRegionCommsListener.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
     public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
 
-    public delegate void ExpectPrimDelegate(ulong regionHandle, LLUUID primID, string objData);
+    public delegate bool ExpectPrimDelegate(ulong regionHandle, LLUUID primID, string objData, int XMLMethod);
 
     public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
 
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 13d1d28..ee2079b 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -78,12 +78,12 @@ namespace OpenSim.Framework
         }
 
 
-        public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData)
+        public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
         {
             handlerExpectPrim = OnExpectPrim;
             if (handlerExpectPrim != null)
             {
-                handlerExpectPrim(regionHandle, primID, objData);
+                handlerExpectPrim(regionHandle, primID, objData, XMLMethod);
                 return true;
             }
             return false;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index fc6da57..095740d 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -101,6 +101,12 @@ namespace OpenSim.Framework
         public bool m_allow_alternate_ports;
 
         protected string m_serverURI;
+
+        public int getInternalEndPointPort()
+        {
+            return m_internalEndPoint.Port;
+        }
+
         public string ServerURI
         {
             get
@@ -279,6 +285,17 @@ namespace OpenSim.Framework
             RegionID = LLUUID.Zero;
             ServerURI = ConvertFrom.ServerURI; 
         }
+        public int getInternalEndPointPort()
+        {
+            return m_internalEndPoint.Port;
+        }
+        public void SetEndPoint(string ipaddr, int port)
+        {
+            IPAddress tmpIP = IPAddress.Parse(ipaddr);
+            IPEndPoint tmpEPE= new IPEndPoint(tmpIP, port);
+            m_internalEndPoint = tmpEPE;
+
+        }
 
         //not in use, should swap to nini though.
         public void LoadFromNiniSource(IConfigSource source)
diff --git a/OpenSim/Framework/RegionUpData.cs b/OpenSim/Framework/RegionUpData.cs
new file mode 100644
index 0000000..dbb805f
--- /dev/null
+++ b/OpenSim/Framework/RegionUpData.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Framework
+{
+    [Serializable]
+    public class RegionUpData
+    {
+        private uint m_X = 0;
+        private uint m_Y = 0;
+        private string m_ipaddr = "";
+        private int m_port = 0;
+        public RegionUpData(uint X, uint Y, string ipaddr, int port)
+        {
+            m_X = X;
+            m_Y = Y;
+            m_ipaddr = ipaddr;
+            m_port = port;
+        }
+
+        public uint X
+        {
+            get { return m_X; }
+        }
+        public uint Y
+        {
+            get { return m_Y; }
+        }
+        public string IPADDR
+        {
+            get { return m_ipaddr; }
+        }
+        public int PORT
+        {
+            get { return m_port; } 
+        }
+            
+    }
+}