aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-29 13:49:20 +0000
committerMelanie Thielker2008-11-29 13:49:20 +0000
commitb8e8a33d60b98894671a34a19e8d982463fa4785 (patch)
treeb6bb8e0a719b24664d391dd76c3add2c5d2f6666 /OpenSim/Region/Environment/Modules/Framework
parentFinally make attachments stay put. Randomize local ID generation to (diff)
downloadopensim-SC-b8e8a33d60b98894671a34a19e8d982463fa4785.zip
opensim-SC-b8e8a33d60b98894671a34a19e8d982463fa4785.tar.gz
opensim-SC-b8e8a33d60b98894671a34a19e8d982463fa4785.tar.bz2
opensim-SC-b8e8a33d60b98894671a34a19e8d982463fa4785.tar.xz
Mantis #2584
Applying a patch from Diva. This patch introduces significant improvements in teleporting. Thank you, Diva.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Framework')
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs15
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
index 21be82a..4833f27 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
@@ -78,6 +78,21 @@ namespace OpenSim.Region.Environment
78 return buildEvent("EnableSimulator", llsdBody); 78 return buildEvent("EnableSimulator", llsdBody);
79 } 79 }
80 80
81 public static OSD DisableSimulator(ulong Handle)
82 {
83 OSDMap llsdSimInfo = new OSDMap(1);
84
85 llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(Handle)));
86
87 OSDArray arr = new OSDArray(1);
88 arr.Add(llsdSimInfo);
89
90 OSDMap llsdBody = new OSDMap(1);
91 llsdBody.Add("SimulatorInfo", arr);
92
93 return buildEvent("DisableSimulator", llsdBody);
94 }
95
81 public static OSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt, 96 public static OSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt,
82 IPEndPoint newRegionExternalEndPoint, 97 IPEndPoint newRegionExternalEndPoint,
83 string capsURL, UUID AgentID, UUID SessionID) 98 string capsURL, UUID AgentID, UUID SessionID)