| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | * | | | Merge branch 'master' into careminster | Melanie | 2013-03-23 | 6 | -11/+60 |
| | |\ \ \
| | |/ / |
|
| | | * | | 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 | 6 | -11/+54 |
| * | | | | 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 | 26 | -20/+65 |
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-03-23 | 25 | -156/+679 |
| |\ \ \
| |/ / |
|
| | * | | Merge branch 'avination' into careminster | Melanie | 2013-03-23 | 1 | -2/+15 |
| | |\ \ |
|
| | | * | | Make sharing errors not spew and let the cache retry the files | Melanie Thielker | 2013-03-23 | 1 | -1/+15 |
| | * | | | Merge branch 'master' into careminster | Melanie | 2013-03-22 | 0 | -0/+0 |
| | |\ \ \
| | | |/
| | |/| |
|
| | | * | | Following on from 476a7d3e (which wasn't enough), make chat across regions on... | Justin Clark-Casey (justincc) | 2013-03-22 | 1 | -56/+31 |
| | * | | | Merge branch 'master' into careminster | Melanie | 2013-03-22 | 2 | -10/+67 |
| | |\ \ \
| | |/ / |
|
| | | * | | Take out a testing sleep I accidentally left in the teleport code from last c... | Justin Clark-Casey (justincc) | 2013-03-22 | 1 | -2/+0 |
| | | * | | At strategic points in the teleport process, if the client has simultaneously... | Justin Clark-Casey (justincc) | 2013-03-22 | 2 | -10/+69 |
| | * | | | Merge branch 'master' into careminster | Melanie | 2013-03-22 | 24 | -144/+597 |
| | |\ \ \
| | |/ / |
|
| | | * | | Implement chat across region borders since we can tell if avatars in neighbou... | Justin Clark-Casey (justincc) | 2013-03-22 | 1 | -1/+1 |
| | | * | | minor: On teleport, signal a child agent before we send the viewer TeleportFi... | Justin Clark-Casey (justincc) | 2013-03-21 | 1 | -5/+5 |
| | | * | | On a teleport, lock m_agentsInTransit whilst we grab the value to check for c... | Justin Clark-Casey (justincc) | 2013-03-21 | 2 | -5/+12 |
| | | * | | 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 |
| | | * | | Add file missing from last commit 36651be | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -0/+91 |
| | | * | | On the later forms of teleport failure, tell the user if this was because vie... | Justin Clark-Casey (justincc) | 2013-03-20 | 6 | -71/+185 |
| | | * | | Insert a short delay on the simulator side rezzing of attachments in order to... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -1/+1 |
| | | * | | Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 2... | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -10/+7 |
| | | * | | 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' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-20 | 1 | -1/+1 |
| | | |\ \ |
|
| | | | * | | BulletSim: change 'degenerate mesh' message from Error to Debug because there | Robert Adams | 2013-03-19 | 1 | -1/+1 |
| | | * | | | Prevent multiple instances of the same item ID being appended to an AvatarApp... | Justin Clark-Casey (justincc) | 2013-03-19 | 3 | -34/+60 |
| | | |/ / |
|
| | | * | | For the moment, disable the output of the 'scene' statistics in SimExtraStats... | Robert Adams | 2013-03-19 | 1 | -1/+3 |
| | | * | | For those people collecting and comparing logfiles from servers scattered | Robert Adams | 2013-03-19 | 1 | -1/+1 |
| | | * | | BulletSim: code to generate a higher resolution terrain mesh. Parameter | Robert Adams | 2013-03-19 | 4 | -18/+189 |
| | | * | | BulletSim: add terrain contact processing threshold parameter. Initialize con... | Robert Adams | 2013-03-19 | 4 | -1/+23 |
| * | | | | Fix SceneManager to use the new automatic property throughout. | Melanie | 2013-03-21 | 1 | -3/+2 |
| |/ / / |
|
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-03-19 | 2 | -12/+37 |
| |\ \ \
| | |/
| |/| |
|
| | * | | * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ... | teravus | 2013-03-16 | 1 | -11/+36 |
| | * | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina... | root | 2013-03-16 | 1 | -2/+2 |
| | |\ \ |
|
| | * | | | Fix case where the string member of a LSL_String in a list is null | root | 2013-03-16 | 1 | -1/+1 |
| * | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2013-03-19 | 0 | -0/+0 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-03-17 | 29 | -8909/+157 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-03-15 | 0 | -0/+0 |
| | |\ \ \ \ \ |
|
| * | | | | | | | Fix merge artefacts | Melanie | 2013-03-19 | 2 | -6/+6 |
| * | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-03-19 | 0 | -0/+0 |
| |\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| | * | | | | | | Process default attachment point in AttachObjectInternal before we check whet... | Justin Clark-Casey (justincc) | 2013-03-19 | 1 | -27/+27 |
| | * | | | | | | Fix tests for multiattach | Melanie | 2013-03-18 | 2 | -6/+6 |
| | * | | | | | | Merge branch 'master' into newmultiattach | Melanie | 2013-03-18 | 88 | -9613/+2109 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach | Melanie | 2013-03-18 | 1 | -139/+167 |
| | |\ \ \ \ \ \ \ |
|
| | * | | | | | | | | Limit each attachment point to 5 items as per spec | Melanie | 2013-03-18 | 1 | -3/+13 |
| | * | | | | | | | | Multiattach, part 2 | Melanie | 2013-03-18 | 1 | -3/+9 |
| | * | | | | | | | | Multiattach, part 1 | Melanie | 2013-03-18 | 7 | -39/+44 |
| * | | | | | | | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminster | Melanie | 2013-03-19 | 2 | -143/+351 |
| |\ \ \ \ \ \ \ \ \
| | |_|/ / / / / /
| |/| | | | | | | |
|
| | * | | | | | | | | Improve rejection of any attempt to reattach an object that is already attached. | Justin Clark-Casey (justincc) | 2013-03-18 | 2 | -31/+194 |
