aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Setting 'in transit' on a local teleport as well as inter-region teleports.Justin Clark-Casey (justincc)2012-05-211-0/+9
* | Merge branch 'master' into careminsterMelanie2012-05-171-4/+12
|\ \ | |/
| * Remove redundant "Teleport failed:" from reason when QueryAccess fails for th...Justin Clark-Casey (justincc)2012-05-171-4/+12
* | Merge branch 'master' into careminsterMelanie2012-05-141-18/+45
|\ \ | |/
| * Set the agent in transit teleport flag at the first available opportunity (i....Justin Clark-Casey (justincc)2012-05-141-11/+37
| * Add more region information to some teleport related loggingJustin Clark-Casey (justincc)2012-05-141-7/+8
* | Merge branch 'master' into careminsterMelanie2012-05-051-8/+8
|\ \ | |/
| * Reinsert a 2000ms delay before closing a no longer required agent on the sour...Justin Clark-Casey (justincc)2012-05-031-2/+7
| * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2012-05-031-6/+1
* | Merge branch 'master' into careminsterMelanie2012-05-022-136/+195
|\ \ | |/
| * Comment out the five second sleep in etm.DoTeleport() if the old agent needs ...Justin Clark-Casey (justincc)2012-05-011-1/+1
| * Remove some test code that accidentally crept in with 9d2e1c67Justin Clark-Casey (justincc)2012-05-011-3/+0
| * Add regression test for teleporting between neighbouring regions on the same ...Justin Clark-Casey (justincc)2012-05-011-4/+26
| * Move max teleport distance check down into etm.DoTeleport() since this should...Justin Clark-Casey (justincc)2012-05-011-40/+41
| * refactor: Split most of EntityTransferModule.Teleport() into its same region ...Justin Clark-Casey (justincc)2012-05-012-122/+159
* | Merge branch 'master' into careminsterMelanie2012-04-272-1/+7
|\ \ | |/
| * If a Grid God teleports then include the Godlike teleport flag. This can affe...Oren Hurvitz2012-04-271-0/+6
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-272-19/+38
| |\
| * | Minor change in error message (HG teleport failures)Diva Canto2012-04-271-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-04-272-18/+33
|\ \ \ | | |/ | |/|
| * | Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-271-1/+2
| * | Tweak log messages on local region to region teleport path to help with probl...Justin Clark-Casey (justincc)2012-04-262-18/+36
| |/
* | Merge branch 'master' into careminsterMelanie2012-04-252-14/+15
|\ \ | |/
| * Slight rewording of output messages.Diva Canto2012-04-241-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-241-0/+1
| |\
| | * zero out SP velocity before calling SP.Teleport(), as the client expects (tho...Justin Clark-Casey (justincc)2012-04-251-0/+1
| * | HG: Moved User-level code down to the HGEntityTransferModule where it belongs.Diva Canto2012-04-242-14/+14
| |/
* | Merge branch 'master' into careminsterMelanie2012-04-251-1/+1
|\ \ | |/
| * Add regression test TestSameRegionTeleport()Justin Clark-Casey (justincc)2012-04-251-1/+1