aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' into careminsterMelanie2012-10-261-12/+13
|\ \ | |/
| * Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations sin...Justin Clark-Casey (justincc)2012-10-261-15/+16
* | Merge branch 'master' into careminsterMelanie2012-10-161-2/+6
|\ \ | |/
| * minor: Add/correct some doc messages associated with entity teleport.Justin Clark-Casey (justincc)2012-10-161-1/+6
* | Merge branch 'master' into careminsterMelanie2012-10-121-4/+4
|\ \ | |/
| * Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas...Justin Clark-Casey (justincc)2012-10-091-4/+4
* | Merge branch 'master' into careminsterMelanie2012-10-071-5/+17
|\ \ | |/
| * On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-5/+17
* | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+1
|\ \
| * | Change the close tmeout from 2 to 3 seconds on teleport. This mayMelanie2012-09-161-1/+1
* | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-271-3/+5
|\ \ \ | | |/ | |/|
| * | Use GridUser properly for foreign users.Diva Canto2012-09-261-0/+2
| * | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
* | | Merge branch 'master' into careminsterMelanie2012-09-241-0/+28
|\ \ \ | |/ /
| * | This fixes HG attachments' missing assets (textures, etc).Diva Canto2012-09-211-0/+28
* | | Merge branch 'master' into careminsterMelanie2012-09-171-31/+59
|\ \ \ | |/ /
| * | HG2.0: Generalized the allowed HG appearances to be more than 1.Diva Canto2012-09-161-31/+59
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \ \ | | |/ | |/|
| * | Wait longer for arrival cofirmation to aid tps into laggy regionsMelanie2012-09-141-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-09-162-3/+172
|\ \ \ | | |/ | |/|
| * | More on HG2.0: added the possibility of controlling the appearance that avies...Diva Canto2012-09-152-2/+171
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-94/+116
|\ \ \ | | |/ | |/|
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-041-0/+6
| |\ \
| | * | let avatar keep flying in tps to same region. (still bad for otherUbitUmarov2012-09-041-0/+6