Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-08-01 | 1 | -0/+2 |
|\ | |||||
| * | Include missing reference that probably stops windows build from commit 12995... | Justin Clark-Casey (justincc) | 2013-08-01 | 1 | -0/+1 |
| * | Experimental comment to eneralize the handling of Linden caps when the | Mic Bowman | 2013-07-31 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 1 | -0/+29 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-11 | 1 | -0/+27 |
| |\ | |||||
| | * | Added a test for the asset service | Diva Canto | 2013-07-11 | 1 | -0/+27 |
| * | | Fix regression where llHTTPRequests which did not get an OK response returned... | Justin Clark-Casey (justincc) | 2013-07-11 | 1 | -0/+1 |
| |/ | |||||
| * | Fix windows build break fromrecent dd1f95 for real this time - put new dll re... | justincc | 2013-07-06 | 1 | -1/+1 |
| * | Fix build break from recent commit dd15f95 on windows | Justin Clark-Casey (justincc) | 2013-07-06 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2013-07-04 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Add --default option to "debug lludp packet" command to allow packet logging ... | Justin Clark-Casey (justincc) | 2013-07-04 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2013-06-23 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Make number of inbound http requests handled available as a httpserver.<port>... | Justin Clark-Casey (justincc) | 2013-06-18 | 1 | -0/+1 |
| * | Make general server stats available on the robust console as well as the simu... | Justin Clark-Casey (justincc) | 2013-06-17 | 1 | -0/+1 |
| * | Adding Avination's PollService to round out the HTTP inventory changes | Melanie | 2013-06-07 | 1 | -0/+1 |
| * | Port Avination's inventory send throttling | Melanie | 2013-06-05 | 1 | -0/+1 |
* | | Merge branch 'avination-current' into careminster | Melanie | 2013-06-06 | 1 | -0/+3 |
|\ \ | |||||
| * \ | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in... | Melanie | 2013-04-28 | 1 | -124/+210 |
| |\ \ | |||||
| * \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-26 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-03 | 1 | -136/+273 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-11 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | dummy commit | ubit | 2012-09-11 | 1 | -1/+2 |
| * | | | | | | | | | | | | try fixing building.. | ubit | 2012-08-16 | 1 | -0/+2 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-06-04 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | UserProfiles | BlueWall | 2013-05-30 | 1 | -0/+38 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-05-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Add HG regression TestCachedUserNameForNewAgent() | Justin Clark-Casey (justincc) | 2013-05-29 | 1 | -0/+1 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-05-24 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | BulletSim: specify directory for OpenSim.Region.Physics.Meshing | Robert Adams | 2013-05-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | BulletSim: add code to experimentally use asset hull data. | Robert Adams | 2013-05-22 | 1 | -0/+1 |
| * | | | | | | | | | | | | Revert "BulletSim: add code to experimentally use asset hull data." | Robert Adams | 2013-05-21 | 1 | -1/+0 |
| * | | | | | | | | | | | | BulletSim: add code to experimentally use asset hull data. | Robert Adams | 2013-05-21 | 1 | -0/+1 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-04-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Add regression test for offer, accept and subsequent receiver delete of an it... | Justin Clark-Casey (justincc) | 2013-04-29 | 1 | -0/+1 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-04-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Small fix to prebuild xml for building with mono tools | BlueWall | 2013-04-20 | 1 | -1/+1 |
| * | | | | | | | | | | | Initial experimental support for materials-capable viewers. This is in a very... | dahlia | 2013-04-18 | 1 | -0/+1 |
| * | | | | | | | | | | | Added missing functionality (mainly custom headers) to llHTTPRequest. | Kevin Cozens | 2013-03-29 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster | Melanie | 2013-03-19 | 1 | -115/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Finally remove the 'REST' ApplicationPlugins code which has been non-function... | Justin Clark-Casey (justincc) | 2013-03-15 | 1 | -115/+0 |
* | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-03-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Make it possible to chain another asset service underneath the de-duplicating... | Justin Clark-Casey (justincc) | 2013-03-15 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-03-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Add code for testing event queue messages recevied on region cross. | Justin Clark-Casey (justincc) | 2013-03-06 | 1 | -0/+1 |