aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' into careminsterMelanie2012-04-251-3/+14
|\ \ | |/
| * Improve teleport log debug and error messages to tell us who is teleporting.Justin Clark-Casey (justincc)2012-04-251-3/+14
* | Merge branch 'master' into careminsterMelanie2012-04-072-113/+10
|\ \ | |/
| * Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAc...Diva Canto2012-04-062-147/+10
| * Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-061-241/+1
| * WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose...Diva Canto2012-04-061-21/+295
* | Merge branch 'master' into careminsterMelanie2012-04-031-2/+4
|\ \ | |/
| * Eliminate race condition where many callers would check SOP.PhysicsActor != n...Justin Clark-Casey (justincc)2012-04-031-4/+4
* | Merge branch 'master' into careminsterMelanie2012-03-291-7/+62
|\ \ | |/
| * HG 2.0 Suitcase inventory: proof of concept now working properly with the hea...Diva Canto2012-03-281-10/+11
| * HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac...Diva Canto2012-03-281-7/+61
* | Merge branch 'master' into careminsterMelanie2012-03-281-10/+44
|\ \ | |/
| * HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarde...Diva Canto2012-03-271-10/+44
* | Merge branch 'master' into careminsterMelanie2012-03-271-0/+15
|\ \ | |/
| * User level based restrictions for HyperGrid teleports, asset uploads, group c...Snoopy Pfeffer2012-03-271-0/+15
* | Merge branch 'master' into careminsterMelanie2012-03-272-3/+29
|\ \ | |/
| * HG: beginning of a more restrictive inventory access procedure (optional). Ex...Diva Canto2012-03-272-3/+29
* | Merge branch 'master' into careminsterMelanie2012-03-141-0/+13
|\ \ | |/
| * Teleports: bounce off repeated requests of teleporting the same agent. Some s...Diva Canto2012-03-131-0/+13
* | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-261-0/+6
* | Merge branch 'master' into careminsterMelanie2012-02-231-8/+5
|\ \ | |/
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-5/+4
* | Merge branch 'master' into careminsterMelanie2012-02-201-1/+3
|\ \ | |/
| * One more tweak related to the previous 2 commits.Diva Canto2012-02-191-1/+3