aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-041-94/+110
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2012-08-311-2/+10
|\ \ \ | |/ /
| * | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-281-2/+10
* | | Merge branch 'master' into careminsterMelanie2012-08-231-1/+1
|\ \ \ | |/ / |/| / | |/
| * Add --force flag to "kick user" console command to allow bypassing of recent ...Justin Clark-Casey (justincc)2012-08-201-1/+1
* | Merge branch 'master' into careminsterMelanie2012-06-281-17/+31
|\ \ | |/
| * Add regression test to check that attachments in source region are deleting w...Justin Clark-Casey (justincc)2012-06-261-0/+5
| * If crossing attachments into another region pre-fatpack, clone objects before...Justin Clark-Casey (justincc)2012-06-261-17/+26
* | Merge branch 'master' into careminsterMelanie2012-06-121-25/+21
|\ \ | |/
| * OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather...Justin Clark-Casey (justincc)2012-06-121-25/+21
* | Merge branch 'master' into careminsterMelanie2012-06-081-1/+0
|\ \ | |/
| * Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTelepo...Justin Clark-Casey (justincc)2012-06-081-1/+0
* | Reverse the logic of a conditional. Clears up a merge artefact.Melanie2012-06-061-1/+1
* | Merge branch 'master' into careminsterMelanie2012-05-293-238/+332
|\ \ | |/
| * refactor: factor out entity transfer state machine into a separate class to m...Justin Clark-Casey (justincc)2012-05-283-239/+330
| * If handling the failure of teleport, move agent state to CleaningUp when we s...Justin Clark-Casey (justincc)2012-05-281-3/+6
* | Merge branch 'master' into careminsterMelanie2012-05-272-358/+519
|\ \ | |/
| * Resolve some mono compiler warnings.Justin Clark-Casey (justincc)2012-05-252-2/+2
| * on agent cross, remove from physics scene after its been placed in transit, n...Justin Clark-Casey (justincc)2012-05-251-3/+7
| * refactor: make ETM.CrossAgentToNewRegionAsync neighbourRegion == null check r...Justin Clark-Casey (justincc)2012-05-251-90/+92
| * Stop it being possible for an agent to teleport back to its source region bef...Justin Clark-Casey (justincc)2012-05-251-24/+165
| * Don't actually proceed on a within-region teleport if another is already taki...Justin Clark-Casey (justincc)2012-05-241-0/+2
| * On inter-region teleport, only stand the avatar up if the QueryAccess call to...Justin Clark-Casey (justincc)2012-05-241-7/+7
| * Now that the EntityTransferModule is per-region, fetch the event queue module...Justin Clark-Casey (justincc)2012-05-241-18/+22
| * Fix issue where a dns resolution failure on the final destination might leave...Justin Clark-Casey (justincc)2012-05-241-192/+200
| * If an agent is still registered as 'in transit' by the source region, don't a...Justin Clark-Casey (justincc)2012-05-242-66/+58