aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-242-3/+3
|\
| * To further help with tracking down the apperance of too much "Unknown User" i...Justin Clark-Casey (justincc)2013-05-212-3/+3
* | Merge branch 'master' into careminsterMelanie2013-05-112-3/+3
|\ \ | |/
| * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-1/+1
| * Fix issue where objects removed via llDie() would not disappear for users loo...Justin Clark-Casey (justincc)2013-05-091-2/+2
* | Merge branch 'master' into careminsterMelanie2013-05-081-0/+59
|\ \ | |/
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-081-0/+59
* | Merge branch 'master' into careminsterMelanie2013-04-302-86/+464
|\ \ | |/
| * Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression testsJustin Clark-Casey (justincc)2013-04-292-5/+198
| * Add regression test for inventory item give, reject and subsequent trash fold...Justin Clark-Casey (justincc)2013-04-291-0/+256
| * Add regression test for offer, accept and subsequent receiver delete of an it...Justin Clark-Casey (justincc)2013-04-291-80/+3
| * Fix bug where an agent that declined an inventory offer and subsequently empt...Justin Clark-Casey (justincc)2013-04-291-2/+8
* | Merge branch 'master' into careminsterMelanie2013-04-251-2/+1
|\ \ | |/
| * Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-241-2/+1
| * Commit Avination's God Kick feature.Melanie2013-04-251-62/+137
| * minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.Updat...Justin Clark-Casey (justincc)2013-04-021-2/+0
* | Merge branch 'master' into careminsterMelanie2013-03-301-6/+7
|\ \ | |/
| * refactor: move the append magic number processing for attachments back up int...Justin Clark-Casey (justincc)2013-03-291-6/+6
* | Merge branch 'master' into careminsterMelanie2013-03-292-21/+20
|\ \ | |/
| * Check viewer 2/3 attachment calls against avatar appearance attachment data r...Justin Clark-Casey (justincc)2013-03-292-21/+21
| * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scrip...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 '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-282-2/+3
|\ \ | |/
| * Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly...Justin Clark-Casey (justincc)2013-03-281-1/+1
| * Make HGLureModule track god like lures as well as normal lures, to see if thi...Justin Clark-Casey (justincc)2013-03-281-1/+2
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-262-0/+2
| * Following on from 476a7d3e (which wasn't enough), make chat across regions on...Justin Clark-Casey (justincc)2013-03-221-56/+31
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-242-0/+2
* | Merge branch 'master' into careminsterMelanie2013-03-224-7/+21
|\ \ | |/
| * Implement chat across region borders since we can tell if avatars in neighbou...Justin Clark-Casey (justincc)2013-03-221-1/+1
| * On the later forms of teleport failure, tell the user if this was because vie...Justin Clark-Casey (justincc)2013-03-201-2/+8
| * Prevent multiple instances of the same item ID being appended to an AvatarApp...Justin Clark-Casey (justincc)2013-03-192-4/+12
| * 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-182-82/+305
| |\
| * \ Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
| |\ \
| * | | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| * | | Multiattach, part 1Melanie2013-03-182-33/+31
* | | | Fix merge artefactsMelanie2013-03-192-6/+6
* | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-192-143/+351
|\ \ \ \ | | |_|/ | |/| |
| * | | Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| * | | Fix recent regression where an item worn to an attachment point that was alre...Justin Clark-Casey (justincc)2013-03-182-89/+153
* | | | Merge branch 'master' into careminsterMelanie2013-03-081-2/+0
|\ \ \ \ | |/ / /