aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \
| * | | | | | | | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| * | | | | | | | Multiattach, part 2Melanie2013-03-181-3/+9
| * | | | | | | | Multiattach, part 1Melanie2013-03-187-39/+44
* | | | | | | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-192-143/+351
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| * | | | | | | | Fix recent regression where an item worn to an attachment point that was alre...Justin Clark-Casey (justincc)2013-03-182-89/+153
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-03-1729-8909/+157
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Make the LSL memory functions virtual so script engines can override them if ...Melanie2013-03-151-3/+3
* | | | | | | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-1929-8909/+157
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | BulletSim: add INI parameter for angular banking timescale fudge parameter.Robert Adams2013-03-162-7/+12
| * | | | | | BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL Gra...Vegaslon2013-03-161-16/+17
| * | | | | | *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a c...teravus2013-03-164-3/+135
| * | | | | | Finally remove the 'REST' ApplicationPlugins code which has been non-function...Justin Clark-Casey (justincc)2013-03-1523-8890/+0
| |/ / / / /
* | | | | | Merge branch 'master' into careminsterMelanie2013-03-1525-339/+474
|\ \ \ \ \ \ | |/ / / / /
generated by cgit v1.1 at 2024-09-20 00:52:00 +0000