aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-291-16/+13
|\
| * Stop attempts to update/add existing attachments in user inventory when telep...Justin Clark-Casey (justincc)2013-03-281-16/+15
* | 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-221-2/+2
|\ \ | |/
| * Prevent multiple instances of the same item ID being appended to an AvatarApp...Justin Clark-Casey (justincc)2013-03-191-2/+2
| * Process default attachment point in AttachObjectInternal before we check whet...Justin Clark-Casey (justincc)2013-03-191-27/+27
| * Fix tests for multiattachMelanie2013-03-181-3/+3
| * Merge branch 'master' into newmultiattachMelanie2013-03-181-63/+61
| |\
| * \ 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-181-30/+28
* | | | Fix merge artefactsMelanie2013-03-191-3/+3
* | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-191-124/+107
|\ \ \ \ | | |_|/ | |/| |
| * | | Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-181-12/+12
| * | | Fix recent regression where an item worn to an attachment point that was alre...Justin Clark-Casey (justincc)2013-03-181-88/+90
* | | | Merge branch 'master' into careminsterMelanie2013-03-081-2/+0
|\ \ \ \ | |/ / /
| * | | minor: remove some completely unused string local vars added recently in comm...Justin Clark-Casey (justincc)2013-03-061-2/+0
| | |/ | |/|
* | | Merge branch 'avination' into careminsterMelanie2013-03-061-28/+36
|\ \ \
| * | | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| * | | Multiattach, part 1Melanie2013-03-051-28/+18
* | | | Merge branch 'master' into careminsterMelanie2013-03-051-144/+165
|\ \ \ \ | | |/ / | |/| |
| * | | Get attachment script state before taking sp.AttachmentsSyncLock() to avoid r...Justin Clark-Casey (justincc)2013-03-051-140/+161
| | |/ | |/|
| * | Implement a workaround solution for saving manual script state changes by the...Justin Clark-Casey (justincc)2013-01-111-5/+19
| * | Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-1/+17
* | | Merge branch 'master' into careminsterMelanie2013-01-041-10/+5
|\ \ \ | |/ / | | / | |/ |/|
| * minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why ...Justin Clark-Casey (justincc)2013-01-031-1/+4
| * Fix problem where object attached from ground often does not get attached pro...Justin Clark-Casey (justincc)2013-01-031-9/+1
* | Merge branch 'master' into careminsterMelanie2012-10-311-3/+3
|\ \ | |/
| * Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-3/+3
* | Merge branch 'master' into careminsterMelanie2012-10-031-1/+10
|\ \ | |/
| * implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-021-1/+10
* | Merge branch 'master' into careminsterMelanie2012-09-291-1/+15
|\ \ | |/
| * Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object...Justin Clark-Casey (justincc)2012-09-291-11/+17
* | Merge branch 'master' into careminsterMelanie2012-09-241-0/+3
|\ \ | |/
| * Guard against inventory get failures.Diva Canto2012-09-221-0/+3
| * Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
* | Fix scripted detach of temp attachmentsMelanie2012-08-201-6/+2
* | Merge branch 'master' into careminsterMelanie2012-08-141-14/+35
|\ \ | |/
| * As per lindn spec, disable detach and drop for temp attachmentsMelanie2012-08-141-0/+8
| * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-141-14/+27
| * Change attachment handling to remove object from the scene first as perMelanie2012-07-231-29/+59
* | Merge branch 'avination' into careminsterMelanie2012-07-231-29/+58
|\ \
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-231-29/+58
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
* | | Merge branch 'master' into careminsterMelanie2012-07-201-6/+10
|\ \ \ | | |/ | |/|