Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-03-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Add missing prebuild.xml dependency for System.Action2<t1,t2> in recent addit... | Robert Adams | 2013-02-28 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | minor: Remove unnecessary very old System.Net reference in OpenSim.Region.Scr... | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -1/+0 |
| * | | | | | | | | | | | Add regression test for llRequestUrl() | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -0/+2 |
* | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -0/+98 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | This should fix the build fail. Fingers crossed. | Diva Canto | 2013-02-19 | 1 | -1/+1 |
| * | | | | | | | | | | | First commit of Diva Groups. The Data bits went to OpenSim.Data core, the res... | Diva Canto | 2013-02-19 | 1 | -0/+48 |
| * | | | | | | | | | | | Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll | Diva Canto | 2013-02-18 | 1 | -0/+50 |
* | | | | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2013-02-07 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 1 | -1/+2 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows... | teravus | 2013-02-07 | 1 | -43/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Commit 1 in of this branch feature. This is one of many... | teravus | 2013-02-03 | 1 | -0/+45 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'dynamic-attributes2' | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | |