1 files changed, 125 insertions, 0 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
new file mode 100644
index 0000000..2cbaf96
--- /dev/null
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+namespace OpenSim.Region.CoreModules.World.Land
+{
+ public class RegionCombinerIndividualEventForwarder
+    {
+        private Scene m_rootScene;
+        private Scene m_virtScene;
+        public RegionCombinerIndividualEventForwarder(Scene rootScene, Scene virtScene)
+        {
+            m_rootScene = rootScene;
+            m_virtScene = virtScene;
+        }
+        public void ClientConnect(IClientAPI client)
+        {
+            m_virtScene.UnSubscribeToClientPrimEvents(client);
+            m_virtScene.UnSubscribeToClientPrimRezEvents(client);
+            m_virtScene.UnSubscribeToClientInventoryEvents(client);
+            m_virtScene.UnSubscribeToClientAttachmentEvents(client);
+            //m_virtScene.UnSubscribeToClientTeleportEvents(client);
+            m_virtScene.UnSubscribeToClientScriptEvents(client);
+            m_virtScene.UnSubscribeToClientGodEvents(client);
+            m_virtScene.UnSubscribeToClientNetworkEvents(client);
+            m_rootScene.SubscribeToClientPrimEvents(client);
+            client.OnAddPrim += LocalAddNewPrim;
+            client.OnRezObject += LocalRezObject;
+            m_rootScene.SubscribeToClientInventoryEvents(client);
+            m_rootScene.SubscribeToClientAttachmentEvents(client);
+            //m_rootScene.SubscribeToClientTeleportEvents(client);
+            m_rootScene.SubscribeToClientScriptEvents(client);
+            m_rootScene.SubscribeToClientGodEvents(client);
+            m_rootScene.SubscribeToClientNetworkEvents(client);
+        }
+        public void ClientClosed(UUID clientid, Scene scene)
+        {
+        }
+        /// <summary>
+        /// Fixes position based on the region the Rez event came in on
+        /// </summary>
+        /// <param name="remoteclient"></param>
+        /// <param name="itemid"></param>
+        /// <param name="rayend"></param>
+        /// <param name="raystart"></param>
+        /// <param name="raytargetid"></param>
+        /// <param name="bypassraycast"></param>
+        /// <param name="rayendisintersection"></param>
+        /// <param name="rezselected"></param>
+        /// <param name="removeitem"></param>
+        /// <param name="fromtaskid"></param>
+        private void LocalRezObject(IClientAPI remoteclient, UUID itemid, Vector3 rayend, Vector3 raystart, 
+            UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem, 
+            UUID fromtaskid)
+        {
+            int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX;
+            int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY;
+            rayend.X += differenceX * (int)Constants.RegionSize;
+            rayend.Y += differenceY * (int)Constants.RegionSize;
+            raystart.X += differenceX * (int)Constants.RegionSize;
+            raystart.Y += differenceY * (int)Constants.RegionSize;
+            m_rootScene.RezObject(remoteclient, itemid, rayend, raystart, raytargetid, bypassraycast,
+                                  rayendisintersection, rezselected, removeitem, fromtaskid);
+        }
+        /// <summary>
+        /// Fixes position based on the region the AddPrimShape event came in on
+        /// </summary>
+        /// <param name="ownerid"></param>
+        /// <param name="groupid"></param>
+        /// <param name="rayend"></param>
+        /// <param name="rot"></param>
+        /// <param name="shape"></param>
+        /// <param name="bypassraycast"></param>
+        /// <param name="raystart"></param>
+        /// <param name="raytargetid"></param>
+        /// <param name="rayendisintersection"></param>
+        private void LocalAddNewPrim(UUID ownerid, UUID groupid, Vector3 rayend, Quaternion rot, 
+            PrimitiveBaseShape shape, byte bypassraycast, Vector3 raystart, UUID raytargetid, 
+            byte rayendisintersection)
+        {
+            int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX;
+            int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY;
+            rayend.X += differenceX * (int)Constants.RegionSize;
+            rayend.Y += differenceY * (int)Constants.RegionSize;
+            raystart.X += differenceX * (int)Constants.RegionSize;
+            raystart.Y += differenceY * (int)Constants.RegionSize;
+            m_rootScene.AddNewPrim(ownerid, groupid, rayend, rot, shape, bypassraycast, raystart, raytargetid,
+                                   rayendisintersection);
+        }
+    }
+}
+\ No newline at end of file

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs new file mode 100644 index 0000000..2cbaf96 --- /dev/null +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
@@ -0,0 +1,125 @@
	1	/*
	2	* Copyright (c) Contributors, http://opensimulator.org/
	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
	4	*
	5	* Redistribution and use in source and binary forms, with or without
	6	* modification, are permitted provided that the following conditions are met:
	7	* * Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* * Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	* * Neither the name of the OpenSimulator Project nor the
	13	* names of its contributors may be used to endorse or promote products
	14	* derived from this software without specific prior written permission.
	15	*
	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	26	*/
	27
	28	using System;
	29	using OpenMetaverse;
	30	using OpenSim.Framework;
	31	using OpenSim.Region.Framework.Scenes;
	32
	33	namespace OpenSim.Region.CoreModules.World.Land
	34	{
	35	public class RegionCombinerIndividualEventForwarder
	36	{
	37	private Scene m_rootScene;
	38	private Scene m_virtScene;
	39
	40	public RegionCombinerIndividualEventForwarder(Scene rootScene, Scene virtScene)
	41	{
	42	m_rootScene = rootScene;
	43	m_virtScene = virtScene;
	44	}
	45
	46	public void ClientConnect(IClientAPI client)
	47	{
	48	m_virtScene.UnSubscribeToClientPrimEvents(client);
	49	m_virtScene.UnSubscribeToClientPrimRezEvents(client);
	50	m_virtScene.UnSubscribeToClientInventoryEvents(client);
	51	m_virtScene.UnSubscribeToClientAttachmentEvents(client);
	52	//m_virtScene.UnSubscribeToClientTeleportEvents(client);
	53	m_virtScene.UnSubscribeToClientScriptEvents(client);
	54	m_virtScene.UnSubscribeToClientGodEvents(client);
	55	m_virtScene.UnSubscribeToClientNetworkEvents(client);
	56
	57	m_rootScene.SubscribeToClientPrimEvents(client);
	58	client.OnAddPrim += LocalAddNewPrim;
	59	client.OnRezObject += LocalRezObject;
	60	m_rootScene.SubscribeToClientInventoryEvents(client);
	61	m_rootScene.SubscribeToClientAttachmentEvents(client);
	62	//m_rootScene.SubscribeToClientTeleportEvents(client);
	63	m_rootScene.SubscribeToClientScriptEvents(client);
	64	m_rootScene.SubscribeToClientGodEvents(client);
	65	m_rootScene.SubscribeToClientNetworkEvents(client);
	66	}
	67
	68	public void ClientClosed(UUID clientid, Scene scene)
	69	{
	70	}
	71
	72	/// <summary>
	73	/// Fixes position based on the region the Rez event came in on
	74	/// </summary>
	75	/// <param name="remoteclient"></param>
	76	/// <param name="itemid"></param>
	77	/// <param name="rayend"></param>
	78	/// <param name="raystart"></param>
	79	/// <param name="raytargetid"></param>
	80	/// <param name="bypassraycast"></param>
	81	/// <param name="rayendisintersection"></param>
	82	/// <param name="rezselected"></param>
	83	/// <param name="removeitem"></param>
	84	/// <param name="fromtaskid"></param>
	85	private void LocalRezObject(IClientAPI remoteclient, UUID itemid, Vector3 rayend, Vector3 raystart,
	86	UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem,
	87	UUID fromtaskid)
	88	{
	89	int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX;
	90	int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY;
	91	rayend.X += differenceX * (int)Constants.RegionSize;
	92	rayend.Y += differenceY * (int)Constants.RegionSize;
	93	raystart.X += differenceX * (int)Constants.RegionSize;
	94	raystart.Y += differenceY * (int)Constants.RegionSize;
	95
	96	m_rootScene.RezObject(remoteclient, itemid, rayend, raystart, raytargetid, bypassraycast,
	97	rayendisintersection, rezselected, removeitem, fromtaskid);
	98	}
	99	/// <summary>
	100	/// Fixes position based on the region the AddPrimShape event came in on
	101	/// </summary>
	102	/// <param name="ownerid"></param>
	103	/// <param name="groupid"></param>
	104	/// <param name="rayend"></param>
	105	/// <param name="rot"></param>
	106	/// <param name="shape"></param>
	107	/// <param name="bypassraycast"></param>
	108	/// <param name="raystart"></param>
	109	/// <param name="raytargetid"></param>
	110	/// <param name="rayendisintersection"></param>
	111	private void LocalAddNewPrim(UUID ownerid, UUID groupid, Vector3 rayend, Quaternion rot,
	112	PrimitiveBaseShape shape, byte bypassraycast, Vector3 raystart, UUID raytargetid,
	113	byte rayendisintersection)
	114	{
	115	int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX;
	116	int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY;
	117	rayend.X += differenceX * (int)Constants.RegionSize;
	118	rayend.Y += differenceY * (int)Constants.RegionSize;
	119	raystart.X += differenceX * (int)Constants.RegionSize;
	120	raystart.Y += differenceY * (int)Constants.RegionSize;
	121	m_rootScene.AddNewPrim(ownerid, groupid, rayend, rot, shape, bypassraycast, raystart, raytargetid,
	122	rayendisintersection);
	123	}
	124	}
	125	} \ No newline at end of file