| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-10-02 | 0 | -0/+0 |
|\ |
|
| * | Allow setting connection limits, part 2 | Melanie | 2012-09-30 | 1 | -1/+26 |
| * | Allow setting max connections for an endpoint | Melanie | 2012-09-30 | 2 | -4/+4 |
| * | Add using clause I missed | Melanie | 2012-09-30 | 1 | -0/+1 |
| * | Allow up to 12 simultaneous connections to a given endpoint rather than 2 | Melanie | 2012-09-30 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-09-30 | 1 | -12/+1 |
|\ \
| |/ |
|
| * | Revert "Added request.Proxy=null everywhere, as discussed in http://stackover... | Diva Canto | 2012-09-30 | 25 | -41/+8 |
| * | Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com... | Diva Canto | 2012-09-30 | 25 | -8/+41 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-30 | 25 | -1448/+2260 |
| |\ |
|
| * | | Made a method of GridUserService virtual so it can be overridden. | Diva Canto | 2012-09-30 | 1 | -12/+1 |
* | | | Merge branch 'avination' into careminster | Melanie | 2012-09-29 | 5 | -37/+140 |
|\ \ \ |
|
| * \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-09-28 | 5 | -57/+147 |
| |\ \ \ |
|
| | * | | | make some forgotten changes be done by simulation thread not by caller | UbitUmarov | 2012-09-27 | 2 | -34/+126 |
| | * | | | Update the Http server with a few additional properties. Adapt the test | Melanie | 2012-09-27 | 2 | -0/+4 |
| * | | | | Fix a possible NRE | Melanie | 2012-09-28 | 1 | -3/+10 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 29 | -1485/+2258 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | Get rid of some unnecessary casts in RemoteAdminPlugin. | Justin Clark-Casey (justincc) | 2012-09-29 | 1 | -5/+5 |
| * | | | | Fix bug where debug http level 6 could not be specified. Also converts newli... | Justin Clark-Casey (justincc) | 2012-09-29 | 2 | -5/+5 |
| * | | | | Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object... | Justin Clark-Casey (justincc) | 2012-09-29 | 2 | -14/+18 |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-29 | 19 | -1376/+2154 |
| |\ \ \ \ |
|
| | * | | | | testing for xml-rpc errors in git repo. | nebadon | 2012-09-28 | 1 | -1/+1 |
| | * | | | | BulletSim: update SOs and DLLs | Robert Adams | 2012-09-28 | 4 | -0/+0 |
| | * | | | | BulletSim: remember to release the physical body and shape when a prim is des... | Robert Adams | 2012-09-28 | 2 | -16/+16 |
| | * | | | | BulletSim: add separate runtime and taint-time linkset children lists to keep... | Robert Adams | 2012-09-27 | 3 | -80/+93 |
| | * | | | | BulletSim: rename some constraint variables to be consistant with other name ... | Robert Adams | 2012-09-27 | 7 | -116/+231 |
| | * | | | | BulletSim: remove the trailing spaces from lines to make git happier | Robert Adams | 2012-09-27 | 10 | -276/+275 |
| | * | | | | BulletSim: remove the unused body management code from BSPrim. There is no go... | Robert Adams | 2012-09-27 | 1 | -374/+0 |
| | * | | | | BulletSim: Fix linkset crash. Caused by the different body and shape | Robert Adams | 2012-09-27 | 9 | -94/+182 |
| | * | | | | BulletSim: Terrain sets proper collision flags on creation. | Robert Adams | 2012-09-27 | 4 | -52/+56 |
| | * | | | | BulletSim: btGhostObjects working to make 'volume detect' work. | Robert Adams | 2012-09-27 | 8 | -194/+268 |
| | * | | | | BulletSim: renamed members of BulletShape, BulletSim and BulletBody | Robert Adams | 2012-09-27 | 11 | -270/+482 |
| | * | | | | BulletSim: fix regression that caused cylindar shapes to have a box collision... | Robert Adams | 2012-09-27 | 1 | -1/+9 |
| | * | | | | BulletSim: complete code for managed code shape and body tracking. Not debugged. | Robert Adams | 2012-09-27 | 5 | -130/+675 |
| | * | | | | BulletSim: add class and infrastructure for shape and object | Robert Adams | 2012-09-27 | 5 | -39/+192 |
| | * | | | | BulletSim: Convert BSCharacter to use common BSPhysObject code and variables. | Robert Adams | 2012-09-27 | 5 | -117/+113 |
| | * | | | | BulletSim: move a bunch of common logic out of BSPrim and BSCharacter | Robert Adams | 2012-09-27 | 7 | -416/+361 |
| * | | | | | Extend attachment regression test to check for appropriate attach event firing. | Justin Clark-Casey (justincc) | 2012-09-29 | 1 | -25/+49 |
| |/ / / / |
|
| * | | | | Comment out unused RestPlugins text in OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2012-09-28 | 1 | -24/+25 |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-28 | 6 | -47/+1 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-27 | 9 | -118/+314 |
| | |\ \ \ |
|
| | | * | | | another osgitbot test from github.. mistakes were made! | nebadon | 2012-09-27 | 1 | -1/+1 |
| | | * | | | another test to see if gitbot is alive yet | nebadon | 2012-09-27 | 1 | -1/+1 |
| | * | | | | Removed the bits about the TOSModule. That module doesn't go into core. WARNI... | Diva Canto | 2012-09-27 | 5 | -47/+0 |
| * | | | | | Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concur... | Justin Clark-Casey (justincc) | 2012-09-28 | 1 | -6/+11 |
* | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 36 | -475/+1637 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-26 | 1 | -5/+1 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | create a new PollServiceHttpRequest req per loop since they can be sent to | UbitUmarov | 2012-09-27 | 1 | -5/+1 |
| * | | | | | Streamline and improve llGetMass | Melanie | 2012-09-26 | 1 | -23/+17 |
| |/ / / / |
|
| * | | | | don't send a partial contents report if we are sending all data | UbitUmarov | 2012-09-26 | 1 | -10/+15 |
| * | | | | add assettype mesh to list of binary assets | UbitUmarov | 2012-09-26 | 1 | -1/+2 |