aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-09-161-3/+3
|\
| * minor: Comment out friends notification log spam for now.Justin Clark-Casey (justincc)2012-09-121-3/+3
* | Merge branch 'avination' into careminsterMelanie2012-09-101-0/+3
|\ \
| * | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IMMelanie2012-09-091-0/+3
* | | Merge branch 'master' into careminsterMelanie2012-08-291-32/+32
|\ \ \ | | |/ | |/|
| * | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folder...Justin Clark-Casey (justincc)2012-08-291-32/+32
* | | 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-08-041-4/+4
|\ \ | |/
| * Fix build break.Justin Clark-Casey (justincc)2012-08-031-1/+1
| * Update settings loading in AvatarFactoryModule which should have been in last...Justin Clark-Casey (justincc)2012-08-031-4/+4
* | 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