aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-020-0/+0
|\
| * Allow setting connection limits, part 2Melanie2012-09-301-1/+26
| * Allow setting max connections for an endpointMelanie2012-09-302-4/+4
| * Add using clause I missedMelanie2012-09-301-0/+1
| * Allow up to 12 simultaneous connections to a given endpoint rather than 2Melanie2012-09-301-0/+1
* | Merge branch 'master' into careminsterMelanie2012-09-301-12/+1
|\ \ | |/
| * Revert "Added request.Proxy=null everywhere, as discussed in http://stackover...Diva Canto2012-09-3025-41/+8
| * Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com...Diva Canto2012-09-3025-8/+41
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-3025-1448/+2260
| |\
| * | Made a method of GridUserService virtual so it can be overridden.Diva Canto2012-09-301-12/+1
* | | Merge branch 'avination' into careminsterMelanie2012-09-295-37/+140
|\ \ \
| * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-285-57/+147
| |\ \ \
| | * | | make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| | * | | Update the Http server with a few additional properties. Adapt the testMelanie2012-09-272-0/+4
| * | | | Fix a possible NREMelanie2012-09-281-3/+10
* | | | | Merge branch 'master' into careminsterMelanie2012-09-2929-1485/+2258
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Get rid of some unnecessary casts in RemoteAdminPlugin.Justin Clark-Casey (justincc)2012-09-291-5/+5
| * | | | Fix bug where debug http level 6 could not be specified. Also converts newli...Justin Clark-Casey (justincc)2012-09-292-5/+5
| * | | | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object...Justin Clark-Casey (justincc)2012-09-292-14/+18
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-2919-1376/+2154
| |\ \ \ \
| | * | | | testing for xml-rpc errors in git repo.nebadon2012-09-281-1/+1
| | * | | | BulletSim: update SOs and DLLsRobert Adams2012-09-284-0/+0
| | * | | | BulletSim: remember to release the physical body and shape when a prim is des...Robert Adams2012-09-282-16/+16
| | * | | | BulletSim: add separate runtime and taint-time linkset children lists to keep...Robert Adams2012-09-273-80/+93
| | * | | | BulletSim: rename some constraint variables to be consistant with other name ...Robert Adams2012-09-277-116/+231
| | * | | | BulletSim: remove the trailing spaces from lines to make git happierRobert Adams2012-09-2710-276/+275
| | * | | | BulletSim: remove the unused body management code from BSPrim. There is no go...Robert Adams2012-09-271-374/+0
| | * | | | BulletSim: Fix linkset crash. Caused by the different body and shapeRobert Adams2012-09-279-94/+182
| | * | | | BulletSim: Terrain sets proper collision flags on creation.Robert Adams2012-09-274-52/+56
| | * | | | BulletSim: btGhostObjects working to make 'volume detect' work.Robert Adams2012-09-278-194/+268
| | * | | | BulletSim: renamed members of BulletShape, BulletSim and BulletBodyRobert Adams2012-09-2711-270/+482
| | * | | | BulletSim: fix regression that caused cylindar shapes to have a box collision...Robert Adams2012-09-271-1/+9
| | * | | | BulletSim: complete code for managed code shape and body tracking. Not debugged.Robert Adams2012-09-275-130/+675
| | * | | | BulletSim: add class and infrastructure for shape and objectRobert Adams2012-09-275-39/+192
| | * | | | BulletSim: Convert BSCharacter to use common BSPhysObject code and variables.Robert Adams2012-09-275-117/+113
| | * | | | BulletSim: move a bunch of common logic out of BSPrim and BSCharacterRobert Adams2012-09-277-416/+361
| * | | | | Extend attachment regression test to check for appropriate attach event firing.Justin Clark-Casey (justincc)2012-09-291-25/+49
| |/ / / /
| * | | | Comment out unused RestPlugins text in OpenSimDefaults.iniJustin Clark-Casey (justincc)2012-09-281-24/+25
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-286-47/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-279-118/+314
| | |\ \ \
| | | * | | another osgitbot test from github.. mistakes were made!nebadon2012-09-271-1/+1
| | | * | | another test to see if gitbot is alive yetnebadon2012-09-271-1/+1
| | * | | | Removed the bits about the TOSModule. That module doesn't go into core. WARNI...Diva Canto2012-09-275-47/+0
| * | | | | Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concur...Justin Clark-Casey (justincc)2012-09-281-6/+11
* | | | | | Merge branch 'avination' into careminsterMelanie2012-09-2736-475/+1637
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'ubitwork' into avinationMelanie2012-09-261-5/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+1
| * | | | | Streamline and improve llGetMassMelanie2012-09-261-23/+17
| |/ / / /
| * | | | don't send a partial contents report if we are sending all dataUbitUmarov2012-09-261-10/+15
| * | | | add assettype mesh to list of binary assetsUbitUmarov2012-09-261-1/+2
generated by cgit v1.1 at 2024-12-19 03:47:46 +0000