| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Added unit tests for Dynamic Attributes | Oren Hurvitz | 2013-01-25 | 1 | -0/+1 |
* | | | | Merge branch 'master' into careminster | Melanie | 2013-01-31 | 1 | -0/+34 |
|\ \ \ \
| |/ / / |
|
| * | | | BulletSim: first unit test: vehicle angular attraction | Robert Adams | 2013-01-28 | 1 | -0/+2 |
| * | | | BulletSim: reorder dependencies for tests and specify path for meshing dll si... | Robert Adams | 2013-01-27 | 1 | -3/+4 |
| * | | | BulletSim: fix reference path for BulletSim tests in prebuild.xml | Robert Adams | 2013-01-27 | 1 | -1/+1 |
| * | | | BulletSim: add framework for BulletSim unit tests. No tests yet. | Robert Adams | 2013-01-27 | 1 | -0/+31 |
| |/ / |
|
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-26 | 1 | -2/+5 |
|\ \ \
| |/ / |
|
| * | | Add basic JsonCreateStore() regression test | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -2/+5 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-24 | 1 | -0/+37 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'master' into cooptermination | Justin Clark-Casey (justincc) | 2013-01-24 | 1 | -34/+2 |
| |\ \ |
|
| * | | | If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then cont... | Justin Clark-Casey (justincc) | 2013-01-23 | 1 | -0/+1 |
| * | | | Implement non-wait co-operative termination of scripts for XEngine in additio... | Justin Clark-Casey (justincc) | 2013-01-17 | 1 | -0/+36 |
* | | | | Merge branch 'avination' into careminster | Melanie | 2013-01-23 | 1 | -0/+1 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Implement HTTP Request froma thread pool to avoid packet congestion | Melanie | 2013-01-20 | 1 | -0/+1 |
* | | | | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 1 | -34/+2 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | This updates prebuild to remove BulletSimN, implements the BulletSim API in B... | teravus | 2013-01-20 | 1 | -34/+0 |
| * | | | * Allow unsafe code with BulletSim | teravus | 2013-01-20 | 1 | -0/+2 |
| | |/
| |/| |
|
| * | | Implement co-operative script termination if termination comes during a scrip... | Justin Clark-Casey (justincc) | 2013-01-16 | 1 | -1/+4 |
| * | | Revert "Implement co-operative script termination if termination comes during... | Justin Clark-Casey (justincc) | 2013-01-16 | 1 | -4/+1 |
| * | | Implement co-operative script termination if termination comes during a scrip... | Justin Clark-Casey (justincc) | 2013-01-16 | 1 | -1/+4 |
| * | | Instead of passing separate engine, part and item components to script APIs, ... | Justin Clark-Casey (justincc) | 2013-01-15 | 1 | -0/+1 |
* | | | JustinCC's core re-merge | Melanie | 2013-01-16 | 1 | -1/+5 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-01-02 | 1 | -0/+1 |
|\ \ \
| |/ / |
|
| * | | BulletSim: first round of conversion from direct BulletSimAPI interfacing by ... | Robert Adams | 2012-12-31 | 1 | -0/+1 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-26 | 1 | -0/+34 |
|\ \ \
| |/ / |
|
| * | | * Initial commit of BulletSimN (BulletSNPlugin). Purely C# implementation o... | teravus | 2012-12-23 | 1 | -0/+34 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-09 | 1 | -1/+9 |
|\ \ \
| |/ / |
|
| * | | One more time... | BlueWall | 2012-12-07 | 1 | -1/+1 |