aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminsterMelanie2013-04-041-3/+1
|\
| * minor: Stop falsely logging that a teleport was being aborted on client logou...Justin Clark-Casey (justincc)2013-04-031-3/+1
* | Merge branch 'master' into careminsterMelanie2013-03-311-5/+5
|\ \ | |/
| * refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to Infor...Justin Clark-Casey (justincc)2013-03-301-9/+9
* | Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminsterMelanie2013-03-291-1/+1
|\ \ | |/
| * Revert "Try eliminating the pause before auto-reteleporting for a megaregion ...Justin Clark-Casey (justincc)2013-03-291-1/+1
* | Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminsterMelanie2013-03-291-1/+1
|\ \ | |/
| * Try eliminating the pause before auto-reteleporting for a megaregion now that...Justin Clark-Casey (justincc)2013-03-291-1/+1
* | Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminsterMelanie2013-03-291-5/+0
|\ \ | |/
| * minor: remove some mono compiler warnings from EntityTransferModuleJustin Clark-Casey (justincc)2013-03-281-5/+0
* | Merge branch 'master' into careminsterMelanie2013-03-282-59/+73
|\ \ | |/
| * Add back a log message when we attempt a megaregion auto-reteleportJustin Clark-Casey (justincc)2013-03-281-0/+4
| * minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if...Justin Clark-Casey (justincc)2013-03-281-4/+7
| * Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region...Justin Clark-Casey (justincc)2013-03-281-1/+1
| * Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly...Justin Clark-Casey (justincc)2013-03-281-3/+12
| * On the North and East sides of a megaregion, only consider regions within 256...Justin Clark-Casey (justincc)2013-03-281-2/+2
| * Remove some Console.WriteLines accidentally left in last commit cfb20f09Justin Clark-Casey (justincc)2013-03-281-2/+0
| * refactor: combine the checks for megaregion view range into a single place.Justin Clark-Casey (justincc)2013-03-281-51/+51
* | Merge branch 'master' into careminsterMelanie2013-03-281-1/+44
|\ \ | |/
| * Fix problem with megaregions where teleporting into a different region which ...Justin Clark-Casey (justincc)2013-03-281-1/+44
* | Merge branch 'master' into careminsterMelanie2013-03-261-10/+109
|\ \ | |/
| * Start recording inter-region teleport attempts, aborts, cancels and failures ...Justin Clark-Casey (justincc)2013-03-251-10/+109
* | Merge branch 'master' into careminsterMelanie2013-03-231-0/+4
|\ \ | |/
| * Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-0/+4
* | Merge branch 'master' into careminsterMelanie2013-03-222-10/+67
|\ \ | |/
| * Take out a testing sleep I accidentally left in the teleport code from last c...Justin Clark-Casey (justincc)2013-03-221-2/+0
| * At strategic points in the teleport process, if the client has simultaneously...Justin Clark-Casey (justincc)2013-03-222-10/+69
* | Merge branch 'master' into careminsterMelanie2013-03-222-21/+34
|\ \ | |/
| * minor: On teleport, signal a child agent before we send the viewer TeleportFi...Justin Clark-Casey (justincc)2013-03-211-5/+5
| * On a teleport, lock m_agentsInTransit whilst we grab the value to check for c...Justin Clark-Casey (justincc)2013-03-211-1/+8
| * On the later forms of teleport failure, tell the user if this was because vie...Justin Clark-Casey (justincc)2013-03-201-15/+21
* | Merge branch 'master' into careminsterMelanie2013-03-132-34/+168
|\ \ | |/
| * Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section...Justin Clark-Casey (justincc)2013-03-121-1/+20
| * Improve teleport cancellation in some circumstances, though cancelling telepo...Justin Clark-Casey (justincc)2013-03-122-34/+149
* | Merge branch 'master' into careminsterMelanie2013-03-081-0/+4
|\ \ | |/
| * Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-061-0/+5
* | Merge branch 'avination' into careminsterMelanie2013-03-031-6/+0
|\ \
| * | Revert "Allow TeleportCancel packets to reset the transfer state machine"Melanie2013-02-241-6/+0
* | | Make sure state machine is reset if crossing is abortedMelanie2013-02-231-0/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-231-45/+69
|\ \ \ | | |/ | |/|
| * | Make reset of EntityTransferStateMachine for an avatar transfer always happen...Justin Clark-Casey (justincc)2013-02-221-42/+81
* | | Merge branch 'avination' into careminsterMelanie2013-01-231-8/+15
|\ \ \ | | |/ | |/|
| * | EXPERIMENTAL - Comment out the check for the agent already being in transitMelanie2013-01-231-8/+9
| * | Allow TeleportCancel packets to reset the transfer state machineMelanie2013-01-211-0/+6
* | | Merge branch 'master' into careminsterMelanie2013-01-161-2/+2
|\ \ \ | |/ / |/| / | |/
| * Changed a couple of debug messages at the request of osgrid.Diva Canto2013-01-161-2/+2
* | Merge branch 'master' into careminsterMelanie2012-11-132-0/+4
|\ \ | |/
| * More module cleanup: removed the CoreModules.Framework modules directives out...Diva Canto2012-11-122-0/+4
* | Merge branch 'master' into careminsterMelanie2012-11-031-2/+2
|\ \ | |/
| * HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ...Diva Canto2012-11-021-2/+2
generated by cgit v1.1 at 2024-12-23 03:46:11 +0000