aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-04-271-1/+1
|\
| * Better error message.Diva Canto2010-04-261-1/+1
| |
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-131-1/+1
|\ \
| * | Test commitMelanie Thielker2010-04-051-1/+1
| | |
| * | Bump version numberMelanie Thielker2010-04-051-1/+1
| | |
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-051-0/+1
|\ \ \ | |/ /
| * | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-051-0/+1
| |\ \
| | * | switch flavor to RC1Justin Clark-Casey (justincc)2010-03-261-1/+1
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-302-4/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | change trunk version to 0.7.DevJustin Clark-Casey (justincc)2010-03-261-2/+2
| | | |
| * | | minor: Print out port that http servers are usingJustin Clark-Casey (justincc)2010-03-251-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-251-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-refactorMelanie2010-03-182-30/+58
|\ \ \ \ | |/ / /
| * | | minor logging changes to BaseHttpServer, OSHttpRequestJustin Clark-Casey (justincc)2010-03-162-30/+58
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-152-6/+7
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell ↵Justin Clark-Casey (justincc)2010-03-112-5/+7
| | | | | | | | | | | | the caller that the best match for an incoming request URI is invoked
| * | very minor spacing adjustmentJustin Clark-Casey (justincc)2010-03-111-1/+0
| |/
* | Merge branch 'master' into careminsterMelanie2010-01-031-1/+1
|\ \ | |/
| * Formatting cleanup. Add copyright headers.Jeff Ames2010-01-041-1/+1
| |
* | Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THISMelanie2009-12-251-1/+1
| | | | | | | | in the repo. This is the Caremninster repo and the number follows CORE. Always.
* | Restore version suffix.Melanie2009-12-251-1/+1
| |
* | Recover out-of-region objects during db load.Kitto Flora2009-12-241-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2009-12-231-7/+7
|\ \ | |/
| * - commented out unused method ConvertIHttpClientContextToOSHttpdr scofield (aka dirk husemann)2009-12-231-7/+7
| |
* | Merge branch 'master' into careminsterMelanie2009-12-201-71/+77
|\ \ | |/
| * Make sure that we catch and display any exceptions that get right to the top ↵Justin Clark-Casey (justincc)2009-12-151-46/+52
| | | | | | | | of our incoming http request handling stack
| * minor: make logging messages consistent in BaseHttpServerJustin Clark-Casey (justincc)2009-12-151-25/+25
| |
* | Fix mantis #10 & #14Kitto Flora2009-12-191-1/+1
| |
* | Fix version numberMelanie2009-12-101-4/+3
| |
* | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-12-101-4/+4
|\ \ | | | | | | | | | careminster
| * | Secnond revision of Sit and Stand for unscripted prims; Comment outKittoFlora2009-12-051-4/+4
| | | | | | | | | | | | spammy debug messages in Interregion....
* | | Merge branch 'master' into careminsterMelanie2009-12-052-3/+19
|\ \ \ | | |/ | |/|
| * | * Fix line endings in BaseHttpServer.csTeravus Ovares (Dan Olivares)2009-12-051-6/+6
| | |
| * | if an xml rpc method throws an exception, log as an error to the console as ↵Justin Clark-Casey (justincc)2009-12-031-3/+11
| | | | | | | | | | | | well as returning the exception to the caller
| * | handle a condition where the http headers apparently have multiple remote ↵dahlia2009-12-021-1/+9
| | | | | | | | | | | | ports designated
* | | Merge branch 'master' into careminsterMelanie2009-11-281-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Apply patch to reduce git revision text length if running sim directly from ↵Justin Clark-Casey (justincc)2009-11-271-1/+1
| | | | | | | | | | | | | | a git tree See http://opensimulator.org/mantis/view.php?id=4030 Thanks ChrisDown (and Bruce for reporting)
* | Update CM versionMelanie2009-11-261-1/+1
|/
* Bump trunk version number to 0.6.9.Justin Clark-Casey (justincc)2009-11-261-1/+1
| | | | This is a place holder name and not necessarily the version number that will be used
* Formatting cleanup.Jeff Ames2009-11-231-1/+1
|
* minor: correct error messages when queryfolder failsJustin Clark-Casey (justincc)2009-11-181-3/+1
|
* minor: remove duplicate copyright notice in PollServiceWorkerThreadJustin Clark-Casey (justincc)2009-11-181-28/+1
|
* Implemented a Watchdog class. Do not manually create Thread objects anymore, ↵John Hurliman2009-10-222-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 stringMelanie2009-10-221-1/+1
|
* Mark new versionMelanie2009-10-221-1/+1
|
* * Removed OpenSim.Data.NHibernateJohn Hurliman2009-10-191-1/+1
| | | | * Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
* Formatting cleanup.Jeff Ames2009-10-191-1/+1
|
* Bug fix.Diva Canto2009-10-071-2/+6
|
* Printout one more field in show threads, but this won't buy us much.Diva Canto2009-10-071-1/+2
|
* Fixing a few compile errors in the previous commitJohn Hurliman2009-10-061-21/+6
|