Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -16/+10 |
|\ | |||||
| * | Fix "show threads" to show threads now being managed by ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -16/+10 |
| | | | | | | | | OpenSim.Framework.Watchdog | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 2 | -63/+60 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | 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 |
| | | | | | | | | | | | | under 27 chars Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client | ||||
| * | Fix build break | Melanie | 2010-09-05 | 1 | -4/+0 |
| | | |||||
* | | Revert "Workaround for mono bug #312968" | Melanie Thielker | 2010-09-06 | 1 | -1/+0 |
| | | | | | | | | | | | | This reverts commit f2e343d53081dbd6956d39b1e172e171101a4900. Doesn't compile with our version of Mono. Patched Mono instead. | ||||
* | | 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 |
| | | | | | | | | on IDwellModule | ||||
| * | 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 |
| | | | | | | | | on IDwellModule | ||||
* | | 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 |
| | | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief. | ||||
| * | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry | Melanie Thielker | 2010-08-25 | 1 | -2/+2 |
| | | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless. | ||||
* | | Prevent an object disposed exception that made forms comms unreliable. After | Melanie Thielker | 2010-08-25 | 1 | -2/+7 |
| | | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief. | ||||
* | | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry | Melanie Thielker | 2010-08-25 | 1 | -2/+2 |
| | | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless. | ||||
* | | 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 ↵ | Diva Canto | 2010-08-06 | 1 | -0/+7 |
| | | | | | | | | requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in. | ||||
* | | 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 |
| | | | | | | | | | | | | currently, for smoe reason the page only appears when you click a face. also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason you can still change the url and normal navigation will work again | ||||
* | | Fix the synchronousrestformsrequester so it will successfully handle a ↵ | Tom Grimshaw | 2010-07-10 | 1 | -1/+1 |
| | | | | | | | | response from a server which does not provide a valid content length header | ||||
* | | Fix an issue where the SynchronousRestObjectRequester will fail if a ↵ | Tom Grimshaw | 2010-07-10 | 1 | -1/+1 |
| | | | | | | | | webserver does not report a content length (-1), but the content is still valid | ||||
* | | 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 ↵ | Tom Grimshaw | 2010-07-03 | 1 | -1/+16 |
| | | | | | | | | 100 seconds. | ||||
* | | 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 |
| | | | | | | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d. | ||||
| * | 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 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+1 |
|\ \ | | | | | | | | | | 0.7.1CM Dev | ||||
| * | | Change trunk versio to 0.7.1 Dev | Melanie | 2010-06-12 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-28 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | add a smidgen more log debug information in the form of the operating system ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -1/+5 |
| | | | | | | | | version | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 1 | -48/+0 |
|\ \ | |/ | |||||
| * | delete now unused MessageServerInfo | Justin Clark-Casey (justincc) | 2010-05-15 | 1 | -48/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Better error message. | Diva Canto | 2010-04-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-13 | 1 | -1/+1 |
|\ \ | |||||
| * | | Test commit | Melanie Thielker | 2010-04-05 | 1 | -1/+1 |
| | | | |||||
| * | | Bump version number | Melanie Thielker | 2010-04-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-05 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | switch flavor to RC1 | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 2 | -4/+2 |
|\ \ \ \ | | |_|/ | |/| | |