aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-222-4/+10
|\
| * 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-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-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
|\ \ \ \ | |/ / /
| * | | 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-062-30/+38
|\ \ \
| * | | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| * | | Multiattach, part 1Melanie2013-03-052-30/+20
* | | | 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-292-25/+61
|\ \ | |/
| * Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object...Justin Clark-Casey (justincc)2012-09-292-14/+18
| * Extend attachment regression test to check for appropriate attach event firing.Justin Clark-Casey (justincc)2012-09-291-25/+49
* | Merge branch 'master' into careminsterMelanie2012-09-242-2/+5
|\ \ | |/
| * Guard against inventory get failures.Diva Canto2012-09-221-0/+3
| * Correctly override and call base OpenSimTestCase.SetUp() method in GridConnec...Justin Clark-Casey (justincc)2012-09-191-2/+2
* | Merge branch 'master' into careminsterMelanie2012-08-231-1/+1
|\ \ | |/
| * Add --force flag to "kick user" console command to allow bypassing of recent ...Justin Clark-Casey (justincc)2012-08-201-1/+1
| * 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-142-16/+37
|\ \ | |/
| * 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-142-17/+30
* | Merge branch 'master' into careminsterMelanie2012-07-251-7/+44
|\ \ | |/
| * Remove bad using statement in AttachmentsModuleTests.Justin Clark-Casey (justincc)2012-07-241-2/+1
| * extend regression TestRezScriptedAttachmentFromInventory() to check actual st...Justin Clark-Casey (justincc)2012-07-241-3/+19
| * extend regression TestDetachScriptedAttachementToInventory() to check correct...Justin Clark-Casey (justincc)2012-07-241-3/+25
| * 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