aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-07-291-0/+3
|\
| * Allow load and save of IAR without a password. The password must still beMelanie2012-07-241-0/+3
* | Merge branch 'master' into careminsterMelanie2012-07-281-1/+1
|\ \
| * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-1/+1
* | | 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-201-10/+10
|\ \ \ | |/ /
| * | Comment out OnIncomingInstantMessage and OnInstantMessage handlers in GroupsM...Justin Clark-Casey (justincc)2012-07-191-10/+10
* | | Merge branch 'master' into careminsterMelanie2012-07-193-11/+17
|\ \ \ | |/ / | | / | |/ |/|
| * Fix regression where llGiveInventory() had stopped asking non-owner receivers...Justin Clark-Casey (justincc)2012-07-172-9/+14
| * 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 'avination' into careminsterMelanie2012-07-061-3/+2
|\ \
| * | stop chat being sent to child avs again.Melanie2012-06-291-3/+2
* | | 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 'avination' into careminsterMelanie2012-06-291-2/+9
|\ \ \ | | |/ | |/|
| * | Fix llRegionSayTo the right wayMelanie2012-06-281-2/+9
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-281-34/+16
* | | Merge branch 'master' into careminsterMelanie2012-06-284-80/+212
|\ \ \ | | |/ | |/|
| * | Fix issue in InventoryArchiveTestCase where it didn't call down to OpenSimTes...Justin Clark-Casey (justincc)2012-06-271-1/+2
| * | 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-272-4/+2
| * | 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
| * | Add regression test to check that attachments in source region are deleting w...Justin Clark-Casey (justincc)2012-06-261-18/+115
| * | minor: update currently commented out log message at top of AvatarFactoryModu...Justin Clark-Casey (justincc)2012-06-251-1/+3