aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-271-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Stop it being possible for an agent to teleport back to its source region ↵Justin Clark-Casey (justincc)2012-05-251-1/+1
| | | | | | | | | | | | | | | | | | 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.
| * If an agent is still registered as 'in transit' by the source region, don't ↵Justin Clark-Casey (justincc)2012-05-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-05-021-3/+13
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * refactor: Split most of EntityTransferModule.Teleport() into its same region ↵Justin Clark-Casey (justincc)2012-05-011-4/+33
| | | | | | | | | | | | and different region teleport components. DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
* | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-141-0/+7
| | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-0/+3
|\ \ | |/
| * HG lures working! Friends can offer friends HG teleports via the profile. ↵Diva Canto2011-05-271-0/+3
| | | | | | | | WARNING: additional configuration for HG inis -- see *Common.ini.example
| * Fix bumping into sim borders and check estate bans for walking crossingsMelanie2011-01-281-1/+1
| |
* | Fix bumping into sim borders and check estate bans for walking crossingsMelanie2011-01-281-1/+1
| |
* | Kick the user from the region in the circumstance that the TP home failed - ↵meta72010-08-301-1/+1
|/ | | | ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable.
* HG 1.5 is in place. Tested in standalone only.Diva Canto2010-01-281-0/+5
|
* * Fixed misspelling of field in GridServiceDiva Canto2010-01-181-0/+3
| | | | * Moved TeleportClientHome to EntityTransferModule
* Moved prim crossing to EntityTransferModule. Not complete yet.Diva Canto2010-01-161-0/+2
|
* Renamed IAgentTransferModule to IEntityTransferModule -- accounts for ↵Diva Canto2010-01-151-0/+50
objects too.