aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-2426-20/+65
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-2325-156/+679
| |\ \
| * | | Fix SceneManager to use the new automatic property throughout.Melanie2013-03-211-3/+2
* | | | Merge branch 'master' into careminsterMelanie2013-03-266-42/+267
|\ \ \ \ | | |_|/ | |/| |
| * | | BulletSim: new algorithm for vertical attraction which uses quaternionRobert Adams2013-03-251-3/+45
| * | | BulletSim: small tweaks and formatting in the parameter fetching code.Robert Adams2013-03-251-5/+16
| * | | BulletSim: fix possible race condition where an prim's asset can be requested...Robert Adams2013-03-253-11/+24
| * | | BulletSim: parameterize C# HACD hull creation. Add feature of reducing max hu...Robert Adams2013-03-252-14/+74
| * | | Start recording inter-region teleport attempts, aborts, cancels and failures ...Justin Clark-Casey (justincc)2013-03-251-10/+109
* | | | Merge branch 'master' into careminsterMelanie2013-03-236-11/+60
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix teleporting into the non-SW 256x256 corner of a megaregion, though curren...Justin Clark-Casey (justincc)2013-03-231-0/+7
| * | Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-236-11/+54
* | | Merge branch 'avination' into careminsterMelanie2013-03-231-2/+15
|\ \ \
| * | | Make sharing errors not spew and let the cache retry the filesMelanie Thielker2013-03-231-1/+15
* | | | Merge branch 'master' into careminsterMelanie2013-03-220-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Following on from 476a7d3e (which wasn't enough), make chat across regions on...Justin Clark-Casey (justincc)2013-03-221-56/+31
* | | | Merge branch 'master' into careminsterMelanie2013-03-222-10/+67
|\ \ \ \ | |/ / /
| * | | Take out a testing sleep I accidentally left in the teleport code from last c...Justin Clark-Casey (justincc)2013-03-221-2/+0
| * | | At strategic points in the teleport process, if the client has simultaneously...Justin Clark-Casey (justincc)2013-03-222-10/+69
* | | | Merge branch 'master' into careminsterMelanie2013-03-2224-144/+597
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Implement chat across region borders since we can tell if avatars in neighbou...Justin Clark-Casey (justincc)2013-03-221-1/+1
| * | minor: On teleport, signal a child agent before we send the viewer TeleportFi...Justin Clark-Casey (justincc)2013-03-211-5/+5
| * | On a teleport, lock m_agentsInTransit whilst we grab the value to check for c...Justin Clark-Casey (justincc)2013-03-212-5/+12
| * | minor: disable logging on regression TestCrossOnSameSimulator() that I accide...Justin Clark-Casey (justincc)2013-03-201-1/+1
| * | minor: don't bother with the pause before rezzing attachments if we are runni...Justin Clark-Casey (justincc)2013-03-201-1/+15
| * | Add file missing from last commit 36651beJustin Clark-Casey (justincc)2013-03-201-0/+91
| * | On the later forms of teleport failure, tell the user if this was because vie...Justin Clark-Casey (justincc)2013-03-206-71/+185
| * | Insert a short delay on the simulator side rezzing of attachments in order to...Justin Clark-Casey (justincc)2013-03-201-1/+1
| * | Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 2...Justin Clark-Casey (justincc)2013-03-201-10/+7
| * | Force a viewer object update for attachments at the end of the final Scene.Co...Justin Clark-Casey (justincc)2013-03-201-0/+9
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-201-1/+1
| |\ \
| | * | BulletSim: change 'degenerate mesh' message from Error to Debug because thereRobert Adams2013-03-191-1/+1
| * | | Prevent multiple instances of the same item ID being appended to an AvatarApp...Justin Clark-Casey (justincc)2013-03-193-34/+60
| |/ /
| * | For the moment, disable the output of the 'scene' statistics in SimExtraStats...Robert Adams2013-03-191-1/+3
| * | For those people collecting and comparing logfiles from servers scatteredRobert Adams2013-03-191-1/+1
| * | BulletSim: code to generate a higher resolution terrain mesh. ParameterRobert Adams2013-03-194-18/+189
| * | BulletSim: add terrain contact processing threshold parameter. Initialize con...Robert Adams2013-03-194-1/+23
* | | Merge branch 'avination' into careminsterMelanie2013-03-192-12/+37
|\ \ \ | | |/ | |/|
| * | * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ...teravus2013-03-161-11/+36
| * | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina...root2013-03-161-2/+2
| |\ \
| * | | Fix case where the string member of a LSL_String in a list is nullroot2013-03-161-1/+1
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-190-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-03-1729-8909/+157
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-150-0/+0
| |\ \ \ \ \
* | | | | | | Fix merge artefactsMelanie2013-03-192-6/+6
* | | | | | | Merge branch 'master' into careminsterMelanie2013-03-190-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Process default attachment point in AttachObjectInternal before we check whet...Justin Clark-Casey (justincc)2013-03-191-27/+27
| * | | | | | Fix tests for multiattachMelanie2013-03-182-6/+6
| * | | | | | Merge branch 'master' into newmultiattachMelanie2013-03-1888-9613/+2109
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
| |\ \ \ \ \ \ \