aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-023-139/+199
|\ \ | |/
| * 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-012-7/+30
| * 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 'avination'Melanie2012-05-021-0/+7
|\ \
| * | Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-021-0/+7
* | | 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-273-20/+39
| |\ \
| * | | Minor change in error message (HG teleport failures)Diva Canto2012-04-271-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-04-273-19/+34
|\ \ \ \ | | |/ / | |/| |
| * | | Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-272-2/+3
| * | | 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
* | Prevent objects rezzed in sim from being seen as attachments and becoming une...Melanie2012-04-171-0/+2
* | Merge branch 'master' into careminsterMelanie2012-04-074-120/+163
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-061-4/+4
| |\
| | * Rather than having a FromFolderID property on every single prim and only ever...Justin Clark-Casey (justincc)2012-04-071-3/+3
| | * Store FromItemID for attachments once on SOG instead of on every SOP and only...Justin Clark-Casey (justincc)2012-04-071-1/+1
| * | Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAc...Diva Canto2012-04-063-150/+159
| |/
| * 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-311-0/+24
|\ \ | |/
| * minor: small message adjustment and unnecessary code elimination when notifyi...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-311-0/+5
* | 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-282-10/+73
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-271-0/+29
| |\
| | * Add "friends show cache <first-name> <last-name>" command for debugging purpo...Justin Clark-Casey (justincc)2012-03-281-0/+29
| * | 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
|\ \ | |/