aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminsterMelanie2013-03-291-1/+1
|\
| * Revert "Try eliminating the pause before auto-reteleporting for a megaregion ...Justin Clark-Casey (justincc)2013-03-291-1/+1
* | Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminsterMelanie2013-03-291-0/+3
|\ \ | |/
| * Add Location (relative), Rotation (Relative) and Rotation (World) to "show pa...Justin Clark-Casey (justincc)2013-03-291-0/+3
* | Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminsterMelanie2013-03-291-1/+1
|\ \ | |/
| * Try eliminating the pause before auto-reteleporting for a megaregion now that...Justin Clark-Casey (justincc)2013-03-291-1/+1
* | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-292-21/+18
|\ \ | |/
| * Stop attempts to update/add existing attachments in user inventory when telep...Justin Clark-Casey (justincc)2013-03-282-21/+20
* | Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminsterMelanie2013-03-291-54/+145
|\ \ | |/
| * Add "debug attachments" console command to allow highly verbose attachment lo...Justin Clark-Casey (justincc)2013-03-281-61/+109
* | Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminsterMelanie2013-03-291-5/+0
|\ \ | |/
| * minor: remove some mono compiler warnings from EntityTransferModuleJustin Clark-Casey (justincc)2013-03-281-5/+0
* | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-291-4/+10
|\ \ | |/
| * If the viewer has already rezzed any attachments itself, then ignore the simu...Justin Clark-Casey (justincc)2013-03-281-4/+10
* | Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-291-1/+1
|\ \ | |/
| * Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with...Justin Clark-Casey (justincc)2013-03-281-1/+1
* | Merge branch 'master' into careminsterMelanie2013-03-284-61/+76
|\ \ | |/
| * Add back a log message when we attempt a megaregion auto-reteleportJustin Clark-Casey (justincc)2013-03-281-0/+4
| * minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if...Justin Clark-Casey (justincc)2013-03-281-4/+7
| * Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region...Justin Clark-Casey (justincc)2013-03-281-1/+1
| * Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly...Justin Clark-Casey (justincc)2013-03-282-4/+13
| * On the North and East sides of a megaregion, only consider regions within 256...Justin Clark-Casey (justincc)2013-03-281-2/+2
| * Make HGLureModule track god like lures as well as normal lures, to see if thi...Justin Clark-Casey (justincc)2013-03-281-1/+2
| * Remove some Console.WriteLines accidentally left in last commit cfb20f09Justin Clark-Casey (justincc)2013-03-281-2/+0
| * refactor: combine the checks for megaregion view range into a single place.Justin Clark-Casey (justincc)2013-03-281-51/+51
* | Merge branch 'master' into careminsterMelanie2013-03-281-1/+44
|\ \ | |/
| * Fix problem with megaregions where teleporting into a different region which ...Justin Clark-Casey (justincc)2013-03-281-1/+44
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-268-5/+15
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-268-4/+14
|\ \
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-248-4/+14
* | | Merge branch 'master' into careminsterMelanie2013-03-261-10/+109
|\ \ \ | | |/ | |/|
| * | Start recording inter-region teleport attempts, aborts, cancels and failures ...Justin Clark-Casey (justincc)2013-03-251-10/+109
* | | Merge branch 'master' into careminsterMelanie2013-03-231-0/+4
|\ \ \ | |/ / | | / | |/ |/|
| * Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-0/+4
| * Following on from 476a7d3e (which wasn't enough), make chat across regions on...Justin Clark-Casey (justincc)2013-03-221-56/+31
* | Merge branch 'avination' into careminsterMelanie2013-03-231-2/+15
|\ \
| * | Make sharing errors not spew and let the cache retry the filesMelanie Thielker2013-03-231-1/+15
* | | 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-227-29/+56
|\ \ \ | |/ /
| * | Implement chat across region borders since we can tell if avatars in neighbou...Justin Clark-Casey (justincc)2013-03-221-1/+1
| * | 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-202-17/+29
| * | Prevent multiple instances of the same item ID being appended to an AvatarApp...Justin Clark-Casey (justincc)2013-03-192-4/+12
| * | For those people collecting and comparing logfiles from servers scatteredRobert Adams2013-03-191-1/+1
| * | Process default attachment point in AttachObjectInternal before we check whet...Justin Clark-Casey (justincc)2013-03-191-27/+27
| * | Fix tests for multiattachMelanie2013-03-182-6/+6
| * | Merge branch 'master' into newmultiattachMelanie2013-03-1810-131/+655
| |\ \