| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 1 | -0/+66 |
|\ |
|
| * | UUIDGatherer now includes UUIDs which reference texture assets used as materials | dahlia | 2013-04-24 | 1 | -0/+66 |
| * | Add Avination's support for parcel eject and freeze | Melanie | 2013-04-25 | 1 | -15/+25 |
* | | Merge branch 'master' into careminster | Melanie | 2013-04-21 | 1 | -9/+35 |
|\ \
| |/ |
|
| * | Materials-capable viewers send ImageUpdate packets when updating materials th... | dahlia | 2013-04-19 | 1 | -11/+35 |
| * | Allow changes to TextureEntry to propagate to viewers when MaterialID changes | dahlia | 2013-04-17 | 1 | -0/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2013-04-10 | 1 | -6/+6 |
|\ \
| |/ |
|
| * | Fix taking (and rezzing) of coalesced objects in the non-root subregions of m... | Justin Clark-Casey (justincc) | 2013-04-06 | 1 | -6/+6 |
* | | Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster | Melanie | 2013-04-04 | 1 | -11/+2 |
|\ \
| |/ |
|
| * | Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent val... | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -11/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 1 | -5/+6 |
|\ \
| |/ |
|
| * | Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than... | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -5/+6 |
* | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | fix minor race condition in SOP.SitTargetPositionLL where inconsistency could... | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 1 | -7/+7 |
|\ \
| |/ |
|
| * | minor: Make SOP.UpdateOffset() more consistent by checking against the same o... | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -7/+7 |
| * | Fix minor race condition where SOP.GetGeometricCenter() and GetCenterOfMass()... | Justin Clark-Casey (justincc) | 2013-04-02 | 1 | -4/+4 |
| * | Export permission, part two. Setting export perms for textures and clothing w... | Melanie | 2013-03-31 | 3 | -10/+74 |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-03-31 | 4 | -79/+95 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster | Melanie | 2013-03-29 | 1 | -5/+2 |
| |\ \
| | |/ |
|
| | * | Check viewer 2/3 attachment calls against avatar appearance attachment data r... | Justin Clark-Casey (justincc) | 2013-03-29 | 1 | -5/+2 |
| * | | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster | Melanie | 2013-03-29 | 3 | -1/+33 |
| |\ \
| | |/ |
|
| | * | Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scrip... | Justin Clark-Casey (justincc) | 2013-03-29 | 3 | -1/+30 |
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-29 | 1 | -21/+0 |
| |\ \
| | |/ |
|
| | * | Eliminate code which tries to restart attachment scripts in ScenePresence.Mak... | Justin Clark-Casey (justincc) | 2013-03-29 | 1 | -18/+0 |
| * | | Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster | Melanie | 2013-03-29 | 1 | -27/+27 |
| |\ \
| | |/ |
|
| | * | minor: comment out unused Scene.AgentCrossing() to reduce code complexity | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -27/+27 |
| * | | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster | Melanie | 2013-03-29 | 1 | -7/+5 |
| |\ \
| | |/ |
|
| | * | If the viewer has already rezzed any attachments itself, then ignore the simu... | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -7/+5 |
| * | | Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminster | Melanie | 2013-03-29 | 1 | -2/+2 |
| |\ \
| | |/ |
|
| | * | Fix regression tests by making a new NPC always trigger simulator side attach... | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -2/+2 |
| * | | Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster | Melanie | 2013-03-29 | 2 | -44/+38 |
| |\ \
| | |/ |
|
| | * | Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with... | Justin Clark-Casey (justincc) | 2013-03-28 | 2 | -38/+31 |
| | * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-26 | 6 | -3/+9 |
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2013-03-26 | 7 | -6/+11 |
| |\ \ |
|
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-03-23 | 3 | -6/+22 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Fix teleporting into the non-SW 256x256 corner of a megaregion, though curren... | Justin Clark-Casey (justincc) | 2013-03-23 | 1 | -0/+7 |
| | * | | Add "show borders" command to show the borders of a region. | Justin Clark-Casey (justincc) | 2013-03-23 | 3 | -6/+16 |
* | | | | Export permission, part two. Setting export perms for textures and clothing w... | Melanie | 2013-03-31 | 3 | -11/+66 |
| |_|/
|/| | |
|
* | | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-24 | 6 | -3/+9 |
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-03-23 | 4 | -23/+144 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-22 | 4 | -23/+144 |
| |\ \
| | |/ |
|
| | * | On a teleport, lock m_agentsInTransit whilst we grab the value to check for c... | Justin Clark-Casey (justincc) | 2013-03-21 | 1 | -4/+4 |
| | * | minor: disable logging on regression TestCrossOnSameSimulator() that I accide... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -1/+1 |
| | * | minor: don't bother with the pause before rezzing attachments if we are runni... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -1/+15 |
| | * | On the later forms of teleport failure, tell the user if this was because vie... | Justin Clark-Casey (justincc) | 2013-03-20 | 2 | -23/+121 |
| | * | Insert a short delay on the simulator side rezzing of attachments in order to... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -1/+1 |
| | * | Force a viewer object update for attachments at the end of the final Scene.Co... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -0/+9 |
| | * | Merge branch 'master' into newmultiattach | Melanie | 2013-03-18 | 5 | -128/+251 |
| | |\ |
|
| | * | | Multiattach, part 1 | Melanie | 2013-03-18 | 1 | -1/+1 |