Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ | |||||
| * | | | change trunk version to 0.7.Dev | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -2/+2 |
| | | | | |||||
| * | | | minor: Print out port that http servers are using | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | do this in callers so that we know who is setting up these things | ||||
| * | | | put out full exception stack if something reaches top of base http server ↵ | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 2 | -30/+58 |
|\ \ \ \ | |/ / / | |||||
| * | | | minor logging changes to BaseHttpServer, OSHttpRequest | Justin Clark-Casey (justincc) | 2010-03-16 | 2 | -30/+58 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 2 | -6/+7 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell ↵ | Justin Clark-Casey (justincc) | 2010-03-11 | 2 | -5/+7 |
| | | | | | | | | | | | | the caller that the best match for an incoming request URI is invoked | ||||
| * | | very minor spacing adjustment | Justin Clark-Casey (justincc) | 2010-03-11 | 1 | -1/+0 |
| |/ | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 1 | -1/+1 |
| | | |||||
* | | Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS | Melanie | 2009-12-25 | 1 | -1/+1 |
| | | | | | | | | in the repo. This is the Caremninster repo and the number follows CORE. Always. | ||||
* | | Restore version suffix. | Melanie | 2009-12-25 | 1 | -1/+1 |
| | | |||||
* | | Recover out-of-region objects during db load. | Kitto Flora | 2009-12-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-23 | 1 | -7/+7 |
|\ \ | |/ | |||||
| * | - commented out unused method ConvertIHttpClientContextToOSHttp | dr scofield (aka dirk husemann) | 2009-12-23 | 1 | -7/+7 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-20 | 1 | -71/+77 |
|\ \ | |/ | |||||
| * | Make sure that we catch and display any exceptions that get right to the top ↵ | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -46/+52 |
| | | | | | | | | of our incoming http request handling stack | ||||
| * | minor: make logging messages consistent in BaseHttpServer | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -25/+25 |
| | | |||||
* | | Fix mantis #10 & #14 | Kitto Flora | 2009-12-19 | 1 | -1/+1 |
| | | |||||
* | | Fix version number | Melanie | 2009-12-10 | 1 | -4/+3 |
| | | |||||
* | | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵ | Melanie | 2009-12-10 | 1 | -4/+4 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Secnond revision of Sit and Stand for unscripted prims; Comment out | KittoFlora | 2009-12-05 | 1 | -4/+4 |
| | | | | | | | | | | | | spammy debug messages in Interregion.... | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-12-05 | 2 | -3/+19 |
|\ \ \ | | |/ | |/| | |||||
| * | | * Fix line endings in BaseHttpServer.cs | Teravus Ovares (Dan Olivares) | 2009-12-05 | 1 | -6/+6 |
| | | | |||||
| * | | if an xml rpc method throws an exception, log as an error to the console as ↵ | Justin Clark-Casey (justincc) | 2009-12-03 | 1 | -3/+11 |
| | | | | | | | | | | | | well as returning the exception to the caller | ||||
| * | | handle a condition where the http headers apparently have multiple remote ↵ | dahlia | 2009-12-02 | 1 | -1/+9 |
| | | | | | | | | | | | | ports designated | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-11-28 | 1 | -1/+1 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Apply patch to reduce git revision text length if running sim directly from ↵ | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | a git tree See http://opensimulator.org/mantis/view.php?id=4030 Thanks ChrisDown (and Bruce for reporting) | ||||
* | | Update CM version | Melanie | 2009-11-26 | 1 | -1/+1 |
|/ | |||||
* | Bump trunk version number to 0.6.9. | Justin Clark-Casey (justincc) | 2009-11-26 | 1 | -1/+1 |
| | | | | This is a place holder name and not necessarily the version number that will be used | ||||
* | Formatting cleanup. | Jeff Ames | 2009-11-23 | 1 | -1/+1 |
| | |||||
* | minor: correct error messages when queryfolder fails | Justin Clark-Casey (justincc) | 2009-11-18 | 1 | -3/+1 |
| | |||||
* | minor: remove duplicate copyright notice in PollServiceWorkerThread | Justin Clark-Casey (justincc) | 2009-11-18 | 1 | -28/+1 |
| | |||||
* | Implemented a Watchdog class. Do not manually create Thread objects anymore, ↵ | John Hurliman | 2009-10-22 | 2 | -12/+2 |
| | | | | use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated | ||||
* | Remove the "mel_t" from version string | Melanie | 2009-10-22 | 1 | -1/+1 |
| | |||||
* | Mark new version | Melanie | 2009-10-22 | 1 | -1/+1 |
| | |||||
* | * Removed OpenSim.Data.NHibernate | John Hurliman | 2009-10-19 | 1 | -1/+1 |
| | | | | * Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing | ||||
* | Formatting cleanup. | Jeff Ames | 2009-10-19 | 1 | -1/+1 |
| | |||||
* | Bug fix. | Diva Canto | 2009-10-07 | 1 | -2/+6 |
| | |||||
* | Printout one more field in show threads, but this won't buy us much. | Diva Canto | 2009-10-07 | 1 | -1/+2 |
| | |||||
* | Fixing a few compile errors in the previous commit | John Hurliman | 2009-10-06 | 1 | -21/+6 |
| | |||||
* | * GridServerPostHandler.cs: Try/catch in Handle | Diva Canto | 2009-10-05 | 1 | -1/+7 |
| | | | | * BaseOpenSimServer.cs: Added thread pool numbers in show threads | ||||
* | More error messages to warn when/if things go wrong. | Diva Canto | 2009-10-05 | 1 | -2/+14 |
| | |||||
* | Leaving the MemoryStreams unclosed. | Diva Canto | 2009-10-04 | 2 | -2/+4 |
| | |||||
* | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-04 | 2 | -5/+20 |
|\ | |||||
| * | Closing another stream. | Diva Canto | 2009-10-02 | 1 | -4/+19 |
| | |