* okay.. Now you can do border crossings with the security 'fixed' client.. with EventQueue enabled.

* You occasionally loose the event queue if you cross back and forth between the same regions many multiples of times. 
* But Don't try to teleport!

1 files changed, 125 insertions, 60 deletions

diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
index 43f1782..cfa0a25 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
@@ -1,44 +1,44 @@
-/*
- * 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 OpenSim 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;
+/*

+ * 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 OpenSim 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 System.Net;

-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-
-namespace OpenSim.Region.Environment
-{
-    public class EventQueueHelper
-    {
-        private EventQueueHelper() {} // no construction possible, it's an utility class
-        
-        public static LLSD EnableSimulator(ulong Handle, IPEndPoint endPoint)
-        {
-            LLSDMap llsdSimInfo = new LLSDMap(3);
+using OpenMetaverse;

+using OpenMetaverse.StructuredData;

+

+namespace OpenSim.Region.Environment

+{

+    public class EventQueueHelper

+    {

+        private EventQueueHelper() {} // no construction possible, it's an utility class

+        

+        public static LLSD EnableSimulator(ulong Handle, IPEndPoint endPoint)

+        {

+            LLSDMap llsdSimInfo = new LLSDMap(3);

             byte[] regionhandle = new byte[8];

             int i = 0;

             

@@ -49,24 +49,89 @@ namespace OpenSim.Region.Environment
             regionhandle[i++] = (byte)((Handle >> 32) % 256);

             regionhandle[i++] = (byte)((Handle >> 24) % 256);

             regionhandle[i++] = (byte)((Handle >> 16) % 256);

-            regionhandle[i++] = (byte)((Handle >> 8) % 256);
+            regionhandle[i++] = (byte)((Handle >> 8) % 256);

             regionhandle[i++] = (byte)(Handle % 256);

-
-            llsdSimInfo.Add("Handle", new LLSDBinary(regionhandle));
-            llsdSimInfo.Add("IP", new LLSDBinary(endPoint.Address.GetAddressBytes()));
-            llsdSimInfo.Add("Port", new LLSDInteger(endPoint.Port));
-            
-            LLSDArray arr = new LLSDArray(1);
-            arr.Add(llsdSimInfo);
-            
-            LLSDMap llsdBody = new LLSDMap(1);
-            llsdBody.Add("SimulatorInfo", arr);
-
-            LLSDMap llsdMessage = new LLSDMap(2);
-            llsdMessage.Add("message", new LLSDString("EnableSimulator"));
-            llsdMessage.Add("body", llsdBody);
-            
-            return llsdMessage;
+

+            llsdSimInfo.Add("Handle", new LLSDBinary(regionhandle));

+            llsdSimInfo.Add("IP", new LLSDBinary(endPoint.Address.GetAddressBytes()));

+            llsdSimInfo.Add("Port", new LLSDInteger(endPoint.Port));

+            

+            LLSDArray arr = new LLSDArray(1);

+            arr.Add(llsdSimInfo);

+            

+            LLSDMap llsdBody = new LLSDMap(1);

+            llsdBody.Add("SimulatorInfo", arr);

+

+            LLSDMap llsdMessage = new LLSDMap(2);

+            llsdMessage.Add("message", new LLSDString("EnableSimulator"));

+            llsdMessage.Add("body", llsdBody);

+            

+            return llsdMessage;

+        }

+        public static LLSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt, 

+                         IPEndPoint newRegionExternalEndPoint,

+                         string capsURL, UUID AgentID, UUID SessionID)

+        {

+            LLSDArray LookAtArr = new LLSDArray(3);

+            LookAtArr.Add(LLSD.FromReal(lookAt.X));

+            LookAtArr.Add(LLSD.FromReal(lookAt.Y));

+            LookAtArr.Add(LLSD.FromReal(lookAt.Z));

+

+            LLSDArray PositionArr = new LLSDArray(3);

+            PositionArr.Add(LLSD.FromReal(pos.X));

+            PositionArr.Add(LLSD.FromReal(pos.Y));

+            PositionArr.Add(LLSD.FromReal(pos.Z));

+

+            LLSDMap InfoMap = new LLSDMap(2);

+            InfoMap.Add("LookAt", LookAtArr);

+            InfoMap.Add("Position", PositionArr);

+

+            LLSDArray InfoArr = new LLSDArray(1);

+            InfoArr.Add(InfoMap);

+

+            LLSDMap AgentDataMap = new LLSDMap(2);

+            AgentDataMap.Add("AgentID", LLSD.FromUUID(AgentID));

+            AgentDataMap.Add("SessionID",  LLSD.FromUUID(SessionID));

+

+            LLSDArray AgentDataArr = new LLSDArray(1);

+            AgentDataArr.Add(AgentDataMap);

+

+            LLSDMap RegionDataMap = new LLSDMap(4);

+            byte[] regionhandle = new byte[8];

+            

+            {

+                int i = 0;

+                regionhandle[i++] = (byte)((Handle >> 56) % 256);

+                regionhandle[i++] = (byte)((Handle >> 48) % 256);

+                regionhandle[i++] = (byte)((Handle >> 40) % 256);

+                regionhandle[i++] = (byte)((Handle >> 32) % 256);

+                regionhandle[i++] = (byte)((Handle >> 24) % 256);

+                regionhandle[i++] = (byte)((Handle >> 16) % 256);

+                regionhandle[i++] = (byte)((Handle >> 8) % 256);

+                regionhandle[i++] = (byte)(Handle % 256);

+            }

+

+            RegionDataMap.Add("RegionHandle", LLSD.FromBinary(regionhandle));

+            RegionDataMap.Add("SeedCapability", LLSD.FromString(capsURL));

+            RegionDataMap.Add("SimIP", LLSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes()));

+            RegionDataMap.Add("SimPort", LLSD.FromInteger(newRegionExternalEndPoint.Port));

+

+            LLSDArray RegionDataArr = new LLSDArray(1);

+            RegionDataArr.Add(RegionDataMap);

+

+

+

+

+            LLSDMap llsdBody = new LLSDMap(3);

+            llsdBody.Add("Info", InfoArr);

+            llsdBody.Add("AgentData", AgentDataArr);

+            llsdBody.Add("RegionData", RegionDataArr);

+

+            LLSDMap llsdMessage = new LLSDMap(2);

+            llsdMessage.Add("message", new LLSDString("CrossedRegion"));

+            llsdMessage.Add("body", llsdBody);

+

+            return llsdMessage;

         }

         public static LLSD KeepAliveEvent()

         {

@@ -76,6 +141,6 @@ namespace OpenSim.Region.Environment
             llsdMessage.Add("body", llsdSimInfo);

 

             return llsdMessage;

-        }
-    }
-}
+        }

+    }

+}