aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'master' into careminsterMelanie2012-07-201-6/+10
|\ \ \ | | |/ | |/|
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
* | | Merge branch 'master' into careminsterMelanie2012-07-191-1/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Restore update of inventory item on derez/logout. This is necessary to updat...Justin Clark-Casey (justincc)2012-07-171-1/+6
| * Stop sending the viewer an inventory create message if a known attachment ite...Justin Clark-Casey (justincc)2012-07-171-4/+1
* | Merge branch 'master' into careminsterMelanie2012-07-122-22/+155
|\ \ | |/
| * Allow XEngine StartDelay to be configured in the [XEngine] config section.Justin Clark-Casey (justincc)2012-07-111-1/+2
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-112-20/+127
| * Add regression TestRezScriptedAttachmentsFromInventory() though this currentl...Justin Clark-Casey (justincc)2012-07-111-1/+26
* | Merge branch 'master' into careminsterMelanie2012-07-112-100/+105
|\ \ | |/
| * When an attachment is detached to inv or derezzed, stop the scripts, update t...Justin Clark-Casey (justincc)2012-07-101-6/+14
| * Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-092-1/+40
| * minor: Remove some wrong comments in attachments regression testsJustin Clark-Casey (justincc)2012-07-061-2/+0
| * Add assert to attachment regression tests to check that number of objects in ...Justin Clark-Casey (justincc)2012-07-061-0/+14
| * refactor: extract method UpdateUserInventoryWithAttachment() from AttachObjec...Justin Clark-Casey (justincc)2012-07-061-29/+38
* | Merge branch 'master' into careminsterMelanie2012-07-051-1/+1
|\ \ | |/
| * Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-051-1/+1
* | Merge branch 'master' into careminsterMelanie2012-06-292-53/+46
|\ \ | |/
| * Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG direct...Justin Clark-Casey (justincc)2012-06-282-40/+45
| * Rather than iterating through all SOGs in the scene looking for the one that ...Justin Clark-Casey (justincc)2012-06-281-24/+17
| * Remove code that tried to delete an attachment back to inventory if RezSingle...Justin Clark-Casey (justincc)2012-06-281-6/+1
* | Merge branch 'master' into careminsterMelanie2012-06-282-77/+206
|\ \ | |/
| * refactor: Move ScenePresence <-> AgentData attachments copying code into Atta...Justin Clark-Casey (justincc)2012-06-271-0/+50
| * Automatically disable log4net before each regression test so that logging is ...Justin Clark-Casey (justincc)2012-06-271-3/+1
| * refactor: Remove unnecessary AttachmentModuleTests.m_userId in favour of loca...Justin Clark-Casey (justincc)2012-06-261-40/+26
| * refactor: Use local attachment module variables instead of global m_attMod.Justin Clark-Casey (justincc)2012-06-261-11/+10
| * refactor: make m_presence a local variable in all AttachmentsModuleTests sinc...Justin Clark-Casey (justincc)2012-06-261-26/+25