| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 1 | -1/+10 |
|\ |
|
| * | Migrate detailed "appearance show" report generation up to AvatarFactoryModul... | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -1/+10 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -21/+1 |
|\ \
| |/ |
|
| * | On a new client circuit, send the initial reply ack to let the client know it... | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -21/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -0/+11 |
|\ \
| |/ |
|
| * | Add test for removing a friendship. | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -0/+11 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 2 | -55/+2 |
|\ \
| |/ |
|
| * | Merge branch 'remove-scene-viewer' | Dan Lake | 2011-11-14 | 1 | -50/+0 |
| |\ |
|
| | * | Remove SceneViewer from ScenePresence to reduce quadruple queueing of | Dan Lake | 2011-11-11 | 1 | -50/+0 |
| * | | Improved method doc for AddFriend() - it actually does set up a two-way relat... | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -5/+2 |
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -0/+14 |
|\ \ \
| |/ / |
|
| * | | Add test for adding a friend whilst online | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -0/+14 |
| |/ |
|
* | | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e... | Dan Lake | 2011-10-19 | 1 | -2/+2 |
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-19 | 1 | -5/+9 |
| |\ |
|
* | \ | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+6 |
|\ \ \
| |/ / |
|
| * | | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... | Dan Lake | 2011-10-19 | 1 | -3/+6 |
* | | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+9 |
|\ \ \
| | |/
| |/| |
|
| * | | Extend scripts stop/start/suspend/resume console commands to allow action on ... | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -5/+9 |
| |/ |
|
* | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+8 |
|\ \
| |/ |
|
| * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -0/+8 |
* | | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+9 |
|\ \
| |/ |
|
| * | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -0/+9 |
* | | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 1 | -27/+10 |
|\ \
| |/ |
|
| * | Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... | Dan Lake | 2011-10-04 | 1 | -22/+9 |
* | | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 1 | -29/+6 |
|\ \
| |/ |
|
| * | Removed redundant code in AttachmentsModule and simplified interfaces which c... | Dan Lake | 2011-10-03 | 1 | -29/+6 |
* | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 1 | -2/+2 |
* | | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+9 |
|\ \
| |/ |
|
| * | minor: remove clutter null check from pass in config to AvatarFactoryModule.I... | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -0/+9 |
* | | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 2 | -1/+17 |
|\ \
| |/ |
|
| * | Reattaching a region was failing if the estate name had not changed (issue 50... | Kevin Houlihan | 2011-09-16 | 2 | -1/+17 |
* | | Bring us up to date. | Tom | 2011-09-14 | 5 | -18/+86 |
|\ \
| |/ |
|
| * | Remove UpdateKnownItem() from IAttachmentsModule. | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -9/+0 |
| * | comment out some recent terrain texture logging | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -1/+1 |
| * | Start locking entire add/remove operations on an IScenePresence.AttachmentsSy... | Justin Clark-Casey (justincc) | 2011-09-12 | 2 | -0/+17 |
| * | When creating an OAR, optionally exclude objects according to their permissions | Oren Hurvitz | 2011-09-12 | 1 | -0/+54 |
| * | Delay loading scripts until the scene has finished loading | Oren Hurvitz | 2011-09-09 | 1 | -0/+5 |
| * | Comment out unused ISceneViewer.Reset() to reduce code complexity | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -1/+1 |
| * | In SceneViewer, introduce an IsEnabled flag and perform Close() under an m_pe... | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -1/+10 |
| * | Get rid of the confusing version of IAttachmentsModule.RezSingleAttachmentFro... | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -14/+0 |
* | | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -1/+1 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 8 | -34/+370 |
|\ \
| |/ |
|
| * | Stop NPCs losing attachments when the source avatar takes them off. | Justin Clark-Casey (justincc) | 2011-09-03 | 2 | -4/+57 |
| * | move common code into AttachmentsModule.DeleteAttachmentsFromScene() | Justin Clark-Casey (justincc) | 2011-08-31 | 2 | -2/+24 |
| * | Make SP.Attachments available as sp.GetAttachments() instead. | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -2/+5 |
| * | refactor: move SP.SaveChangedAttachments() fully into AttachmentsModule | Justin Clark-Casey (justincc) | 2011-08-30 | 2 | -0/+17 |
| * | refactor: Move ScenePresence.RezAttachments() into AttachmentsModule | Justin Clark-Casey (justincc) | 2011-08-30 | 2 | -0/+62 |
| * | refactor: migrate DropObject handling fully into AttachmentsModule from Scene | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -4/+4 |