From 4ac3c0e81b8760ef31f741cd55e703eee86b93b7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 15 Jan 2010 17:14:48 -0800
Subject: Renamed IAgentTransferModule to IEntityTransferModule -- accounts for
objects too.
---
.../Framework/Interfaces/IEntityTransferModule.cs | 50 ++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
new file mode 100644
index 0000000..96884b3
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -0,0 +1,50 @@
+/*
+ * 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 OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+using OpenMetaverse;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+ public interface IEntityTransferModule
+ {
+ void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position,
+ Vector3 lookAt, uint teleportFlags);
+
+ void Cross(ScenePresence agent, bool isFlying);
+
+ void AgentArrivedAtDestination(UUID agent);
+
+ void EnableChildAgents(ScenePresence agent);
+
+ void EnableChildAgent(ScenePresence agent, GridRegion region);
+ }
+}
--
cgit v1.1
From bd6d1a24448dafea5be7ddbcd591b352040e4412 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 16 Jan 2010 07:46:07 -0800
Subject: Moved prim crossing to EntityTransferModule. Not complete yet.
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 96884b3..a0505df 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -46,5 +46,7 @@ namespace OpenSim.Region.Framework.Interfaces
void EnableChildAgents(ScenePresence agent);
void EnableChildAgent(ScenePresence agent, GridRegion region);
+
+ void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
}
}
--
cgit v1.1
From bbbe9e73cca2a0ed5d35db1b054b8ed4cd23bfea Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 18 Jan 2010 09:14:19 -0800
Subject: * Fixed misspelling of field in GridService * Moved
TeleportClientHome to EntityTransferModule
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 3 +++
1 file changed, 3 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index a0505df..73c68f1 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -30,6 +30,7 @@ using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;
using OpenMetaverse;
+using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Framework.Interfaces
@@ -39,6 +40,8 @@ namespace OpenSim.Region.Framework.Interfaces
void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position,
Vector3 lookAt, uint teleportFlags);
+ void TeleportHome(UUID id, IClientAPI client);
+
void Cross(ScenePresence agent, bool isFlying);
void AgentArrivedAtDestination(UUID agent);
--
cgit v1.1
From 00f7d622cbc2c2e61d2efaacd8275da3f9821d8b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 28 Jan 2010 19:19:42 -0800
Subject: HG 1.5 is in place. Tested in standalone only.
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 73c68f1..e8738c4 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -52,4 +52,9 @@ namespace OpenSim.Region.Framework.Interfaces
void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
}
+
+ public interface IUserAgentVerificationModule
+ {
+ bool VerifyClient(AgentCircuitData aCircuit, string token);
+ }
}
--
cgit v1.1
From d90b0c53ec747c512b1efccf6f25596dac9c3e41 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 28 Jan 2011 01:37:37 +0100
Subject: Fix bumping into sim borders and check estate bans for walking
crossings
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index e8738c4..8b96de4 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Framework.Interfaces
void TeleportHome(UUID id, IClientAPI client);
- void Cross(ScenePresence agent, bool isFlying);
+ bool Cross(ScenePresence agent, bool isFlying);
void AgentArrivedAtDestination(UUID agent);
--
cgit v1.1
From 76525be7b2cb1a72c45a72801dac871c4a338bcb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 27 May 2011 13:07:18 -0700
Subject: HG lures working! Friends can offer friends HG teleports via the
profile. WARNING: additional configuration for HG inis -- see
*Common.ini.example
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 3 +++
1 file changed, 3 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 8b96de4..07e97d5 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -40,6 +40,9 @@ namespace OpenSim.Region.Framework.Interfaces
void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position,
Vector3 lookAt, uint teleportFlags);
+ void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
+ Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq);
+
void TeleportHome(UUID id, IClientAPI client);
bool Cross(ScenePresence agent, bool isFlying);
--
cgit v1.1
From 37dd174697c0bcc201f8d8e4d7569c2a51f53757 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 1 May 2012 17:52:30 +0100
Subject: refactor: Split most of EntityTransferModule.Teleport() into its same
region and different region teleport components.
DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
---
.../Framework/Interfaces/IEntityTransferModule.cs | 37 +++++++++++++++++++---
1 file changed, 33 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 07e97d5..18e9e3c 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -37,12 +37,41 @@ namespace OpenSim.Region.Framework.Interfaces
{
public interface IEntityTransferModule
{
- void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position,
- Vector3 lookAt, uint teleportFlags);
+ ///
+ /// Teleport an agent within the same or to a different region.
+ ///
+ ///
+ ///
+ /// The handle of the destination region. If it's the same as the region currently
+ /// occupied by the agent then the teleport will be within that region.
+ ///
+ ///
+ ///
+ ///
+ void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
- void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
- Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq);
+ ///
+ /// Teleport an agent directly to a given region without checking whether the region should be subsituted.
+ ///
+ ///
+ /// Please use Teleport() instead unless you know exactly what you're doing.
+ /// Do not use for same region teleports.
+ ///
+ ///
+ ///
+ /// /param>
+ ///
+ ///
+ ///
+ void DoTeleport(
+ ScenePresence sp, GridRegion reg, GridRegion finalDestination,
+ Vector3 position, Vector3 lookAt, uint teleportFlags);
+ ///
+ /// Teleports the agent for the given client to their home destination.
+ ///
+ ///
+ ///
void TeleportHome(UUID id, IClientAPI client);
bool Cross(ScenePresence agent, bool isFlying);
--
cgit v1.1
From 459c7635afdbc4002cacbf5780185645a4296f6a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 24 May 2012 00:31:14 +0100
Subject: If an agent is still registered as 'in transit' by the source region,
don't allow an immediate teleport back.
This is to help relieve a race condition when an agent teleports then immediately attempts to teleport back before the source region has properly cleaned up/demoted the old ScenePresence.
This is rare in viewers but much more possible via scripting or region module.
However, more needs to be done since virtually all clean up happens after the transit flag is cleared .
Possibly need to add a 'cleaning up' state to in transit.
This change required making the EntityTransferModule and HGEntityTransferModule per-region rather than shared, in order to allow separate transit lists.
Changes were also required in LocalSimulationConnector.
Tested in standalone, grid and with local and remote region crossings with attachments.
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 18e9e3c..75c44d5 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -74,6 +74,13 @@ namespace OpenSim.Region.Framework.Interfaces
///
void TeleportHome(UUID id, IClientAPI client);
+ ///
+ /// Show whether the given agent is being teleported.
+ ///
+ /// true if the agent is in the process of being teleported, false otherwise.
+ /// The agent ID
+ bool IsInTransit(UUID id);
+
bool Cross(ScenePresence agent, bool isFlying);
void AgentArrivedAtDestination(UUID agent);
--
cgit v1.1
From 40c78b06246d1131e07982dc6a9366666d9ea031 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 May 2012 02:02:53 +0100
Subject: Stop it being possible for an agent to teleport back to its source
region before the source region has finished cleaning up old agent data and
structures.
If this is allowed, then the client usually gets forcibly logged out and data structures might be put into bad states.
To prevent this, the binary state machine of EMT.m_agentsInTransit is replaced with a 4 state machine (Preparing, Transferring, ReceivedAtDestination, CleaningUp).
This is necessary because the source region needs to know when the destination region has received the user but a teleport back cannot happen until the source region has cleaned up.
Tested on standalone, grid and with v1 and v3 clients.
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 75c44d5..69be83e 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -77,8 +77,8 @@ namespace OpenSim.Region.Framework.Interfaces
///
/// Show whether the given agent is being teleported.
///
- /// true if the agent is in the process of being teleported, false otherwise.
/// The agent ID
+ /// true if the agent is in the process of being teleported, false otherwise.
bool IsInTransit(UUID id);
bool Cross(ScenePresence agent, bool isFlying);
--
cgit v1.1
From 4c83b5e719ad288b1250fbed3f74698fa34eff21 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 7 May 2013 00:31:11 +0100
Subject: Step one of estate settings sharing - port the Avination Estate
module (complete module) as changes are too extensive to apply manually
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 69be83e..1c43a25 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Interfaces
///
///
///
- void TeleportHome(UUID id, IClientAPI client);
+ bool TeleportHome(UUID id, IClientAPI client);
///
/// Show whether the given agent is being teleported.
--
cgit v1.1
From 97934e00e667b6f432340a54671221a970a048d7 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 11 Dec 2013 00:12:36 +0000
Subject: This is the Avination Entity Transfer Module. Surprisingly, it still
compiles but I don't know if it runs. Will probably crash and burn as the
supporting code isn't there yet.
---
.../Framework/Interfaces/IEntityTransferModule.cs | 32 +++++++---------------
1 file changed, 10 insertions(+), 22 deletions(-)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 1c43a25..1949a90 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -35,6 +35,8 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Framework.Interfaces
{
+ public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
+
public interface IEntityTransferModule
{
///
@@ -50,30 +52,11 @@ namespace OpenSim.Region.Framework.Interfaces
///
void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
- ///
- /// Teleport an agent directly to a given region without checking whether the region should be subsituted.
- ///
- ///
- /// Please use Teleport() instead unless you know exactly what you're doing.
- /// Do not use for same region teleports.
- ///
- ///
- ///
- /// /param>
- ///
- ///
- ///
- void DoTeleport(
- ScenePresence sp, GridRegion reg, GridRegion finalDestination,
- Vector3 position, Vector3 lookAt, uint teleportFlags);
-
- ///
- /// Teleports the agent for the given client to their home destination.
- ///
- ///
- ///
bool TeleportHome(UUID id, IClientAPI client);
+ void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
+ Vector3 position, Vector3 lookAt, uint teleportFlags);
+
///
/// Show whether the given agent is being teleported.
///
@@ -89,7 +72,12 @@ namespace OpenSim.Region.Framework.Interfaces
void EnableChildAgent(ScenePresence agent, GridRegion region);
+ GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos);
+
void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
+
+ ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
+
}
public interface IUserAgentVerificationModule
--
cgit v1.1
From e5f7c8b6e83170cbc7e0d49d9efd3fc3600396d3 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 24 Dec 2013 12:31:26 -0800
Subject: varregion: add lots of DEBUG level log messages. Especially for
teleport.
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 3fa3706..966916a 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -76,8 +76,7 @@ namespace OpenSim.Region.Framework.Interfaces
void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
- ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
-
+ ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
}
public interface IUserAgentVerificationModule
--
cgit v1.1
From b52b50ee56f3461d7f2dc47a905a0b10d07d3346 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 17 Jan 2014 23:36:23 +0000
Subject: minor: reinsert some method doc back into IEntityTransferModule
---
.../Framework/Interfaces/IEntityTransferModule.cs | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 1949a90..214b07a 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -47,13 +47,33 @@ namespace OpenSim.Region.Framework.Interfaces
/// The handle of the destination region. If it's the same as the region currently
/// occupied by the agent then the teleport will be within that region.
///
+ ///
+ ///
///
///
///
void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
+ ///
+ /// Teleports the agent for the given client to their home destination.
+ ///
+ ///
+ ///
bool TeleportHome(UUID id, IClientAPI client);
+ ///
+ /// Teleport an agent directly to a given region without checking whether the region should be substituted.
+ ///
+ ///
+ /// Please use Teleport() instead unless you know exactly what you're doing.
+ /// Do not use for same region teleports.
+ ///
+ ///
+ ///
+ /// /param>
+ ///
+ ///
+ ///
void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
Vector3 position, Vector3 lookAt, uint teleportFlags);
--
cgit v1.1
From 7fc289c039ca3cdbad0f050e17c1b1d13e684c73 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 15 Feb 2014 17:02:53 -0800
Subject: Properly restore position on crossing failure for mega-regions. Fix
odd "cannot cross into banned parcel" viewer error message when crossing into
non-existant region. Proper permission failure messages are now returned.
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 709d8fc..5d07a5f 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -92,11 +92,12 @@ namespace OpenSim.Region.Framework.Interfaces
void EnableChildAgent(ScenePresence agent, GridRegion region);
- GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos);
+ GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version,
+ out Vector3 newpos, out string reason);
void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
- ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
+ ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
}
public interface IUserAgentVerificationModule
--
cgit v1.1
From 1d19e1bbd0dfc1e7de99652284963d330f04de99 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 4 Nov 2014 16:49:32 +0000
Subject: Add naive implementation of controlled incoming HG attachments to
manage load.
Instead of processing all incoming attachment scene object concurrently, process them consecutively to eliminate potential overload from this source.
This is a naive implementation because it does not currently account for slow foreign asset services.
Although it may take longer, this approach may also improve attachment visibility for HG avatars
since the scene object is now always added to the scene after receiving assets from the foreign service and not before.
---
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 5d07a5f..1ebef90 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -98,6 +98,8 @@ namespace OpenSim.Region.Framework.Interfaces
void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
+
+ bool HandleIncomingSceneObject(SceneObjectGroup so, Vector3 newPosition);
}
public interface IUserAgentVerificationModule
--
cgit v1.1