Merge branch 'master' into careminster-presence-refactor

2026-08-05 00:46:02 +08:00 · 2011-06-09 02:05:04 +01:00
parent a41051f1dd 49e4e53928
commit 326c46ba70
119 changed files with 6471 additions and 4318 deletions
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -42,6 +42,9 @@ namespace OpenSim.Region.Framework.Interfaces

        bool TeleportHome(UUID id, IClientAPI client);

+        void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
+            Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq);
+
        bool Cross(ScenePresence agent, bool isFlying);

        void AgentArrivedAtDestination(UUID agent);