| Commit message (Expand) | Author | Age | Files | Lines |
* | Remove "OpenSimulator" from startup message | Melanie | 2010-11-09 | 1 | -1/+1 |
* | Change "OpenSim" to "Careminster" and remove CM suffix. | Melanie | 2010-11-09 | 1 | -2/+2 |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 2 | -1/+5 |
|\ |
|
| * | Support for CORS with simple requests in BaseHttpServer | Marck | 2010-11-02 | 1 | -0/+4 |
| * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+2 |
| * | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 1 | -1/+2 |
| |\ |
|
| * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -5/+5 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | |/
| |/| |
|
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 1 | -1/+2 |
|\ \ \
| |/ / |
|
| * | | * Partially complete stuff for Mesh support that Melanie wanted to see before... | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -1/+2 |
| |/ |
|
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -16/+10 |
|\ \
| |/ |
|
| * | Fix "show threads" to show threads now being managed by OpenSim.Framework.Wat... | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -16/+10 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 2 | -63/+60 |
|\ \
| |/ |
|
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -62/+59 |
| * | Remove parenthesis around the release flavour to get the version string back ... | Justin Clark-Casey (justincc) | 2010-09-10 | 1 | -1/+1 |
| * | Fix build break | Melanie | 2010-09-05 | 1 | -4/+0 |
* | | Revert "Workaround for mono bug #312968" | Melanie Thielker | 2010-09-06 | 1 | -1/+0 |
* | | Workaround for mono bug #312968 | Melanie Thielker | 2010-09-06 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -57/+54 |
| * | Added XFF header processing. Untested, for lack of proxy. | Diva Canto | 2010-09-03 | 1 | -0/+2 |
* | | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -58/+51 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -2/+8 |
|\ \
| |/ |
|
| * | minor: Add some method doc to BaseHttpServer.HandleRequest() | Justin Clark-Casey (justincc) | 2010-08-30 | 1 | -2/+8 |
| * | Prevent an object disposed exception that made forms comms unreliable. After | Melanie Thielker | 2010-08-25 | 1 | -2/+7 |
| * | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry | Melanie Thielker | 2010-08-25 | 1 | -2/+2 |
* | | Prevent an object disposed exception that made forms comms unreliable. After | Melanie Thielker | 2010-08-25 | 1 | -2/+7 |
* | | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry | Melanie Thielker | 2010-08-25 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -0/+7 |
|\ \
| |/ |
|
| * | HACK ALERT! There's some underlying bug in the HTTP server that makes request... | Diva Canto | 2010-08-06 | 1 | -0/+7 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | comment out further debug line in BaseHttpServer | Justin Clark-Casey (justincc) | 2010-07-27 | 1 | -1/+1 |
| * | do a whole load of crappy hacking to get cubes to display google.com | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -1/+1 |
* | | Fix the synchronousrestformsrequester so it will successfully handle a respon... | Tom Grimshaw | 2010-07-10 | 1 | -1/+1 |
* | | Fix an issue where the SynchronousRestObjectRequester will fail if a webserve... | Tom Grimshaw | 2010-07-10 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-08 | 1 | -2/+13 |
|\ \
| |/ |
|
| * | Handle a specific exception without spewing red ink. | Melanie | 2010-07-08 | 1 | -2/+13 |
* | | Correct positioning of timeout modifier in the SynchronousRestObjectRequester | Tom Grimshaw | 2010-07-04 | 1 | -1/+1 |
* | | Implement a timeout value in the SynchronousRestObjectRequester. Default is 1... | Tom Grimshaw | 2010-07-03 | 1 | -1/+16 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | fix web request exception reporting properly this time | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| * | Revert "Report http server onRequest() exception properly." | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| * | Report http server onRequest() exception properly. | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| * | Readjust master version and flavor | Melanie | 2010-06-15 | 1 | -2/+2 |
| * | Change flavor to 0.7-RC1 | Melanie | 2010-06-12 | 1 | -2/+2 |