Melanie
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
Justin Clark-Casey (justincc)
565db4635f
add a smidgen more log debug information in the form of the operating system version
2010-05-28 18:30:33 +01:00
Melanie
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
Justin Clark-Casey (justincc)
4b755c6d80
delete now unused MessageServerInfo
2010-05-15 02:17:10 +01:00
Melanie
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
Diva Canto
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
Melanie
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
Melanie Thielker
a573b5767b
Test commit
2010-04-05 22:31:30 +02:00
Melanie Thielker
5c04d768a6
Bump version number
2010-04-05 22:26:18 +02:00
Melanie
ba31b31ed0
Merge branch 'careminster' into careminster-presence-refactor
2010-04-05 18:22:15 +01:00
Melanie
04a68db195
Merge branch '0.6.9-post-fixes' into careminster
2010-04-05 18:10:36 +01:00
Melanie
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
Justin Clark-Casey (justincc)
dd544f811a
switch flavor to RC1
2010-03-26 19:09:09 +00:00
Justin Clark-Casey (justincc)
4565e5dfbc
change trunk version to 0.7.Dev
2010-03-26 18:56:05 +00:00
Justin Clark-Casey (justincc)
bfbf25c542
minor: Print out port that http servers are using
...
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
Justin Clark-Casey (justincc)
6ad85dc259
put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
...
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
Melanie
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
Justin Clark-Casey (justincc)
a647f50087
minor logging changes to BaseHttpServer, OSHttpRequest
2010-03-16 22:58:12 +00:00
Melanie
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
Justin Clark-Casey (justincc)
2313d14acb
minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell the caller that the best match for an incoming request URI is invoked
2010-03-11 23:33:55 +00:00
Justin Clark-Casey (justincc)
a578feefba
very minor spacing adjustment
2010-03-11 20:20:38 +00:00
Melanie
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
Jeff Ames
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
Melanie
59f683066a
Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS
...
in the repo. This is the Caremninster repo and the number follows CORE. Always.
2009-12-25 23:23:49 +00:00
Melanie
b19e564317
Restore version suffix.
2009-12-25 23:20:30 +00:00
Kitto Flora
e7439efc74
Recover out-of-region objects during db load.
2009-12-24 19:19:44 -05:00
Melanie
6eecbc95e4
Merge branch 'master' into careminster
2009-12-23 21:22:19 +00:00
dr scofield (aka dirk husemann)
9c294c5663
- commented out unused method ConvertIHttpClientContextToOSHttp
2009-12-23 18:33:54 +01:00
Melanie
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
Kitto Flora
e38e8ae987
Fix mantis #10 & #14
2009-12-19 19:54:44 -05:00
Justin Clark-Casey (justincc)
87e9062862
Make sure that we catch and display any exceptions that get right to the top of our incoming http request handling stack
2009-12-15 16:34:27 +00:00
Justin Clark-Casey (justincc)
57d60a95a2
minor: make logging messages consistent in BaseHttpServer
2009-12-15 16:23:57 +00:00
Melanie
0889b5aef1
Fix version number
2009-12-10 18:20:40 +00:00
Melanie
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
Melanie
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
Teravus Ovares (Dan Olivares)
8e089b6d8d
* Fix line endings in BaseHttpServer.cs
2009-12-05 13:23:05 -05:00
KittoFlora
cc8246206d
Secnond revision of Sit and Stand for unscripted prims; Comment out
...
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01:00
Justin Clark-Casey (justincc)
504bfd87d5
if an xml rpc method throws an exception, log as an error to the console as well as returning the exception to the caller
2009-12-03 18:05:42 +00:00
dahlia
4234c64147
handle a condition where the http headers apparently have multiple remote ports designated
2009-12-02 04:10:53 -08:00
Melanie
d3e7a52933
Merge branch 'master' into careminster
2009-11-28 09:26:00 +00:00
Justin Clark-Casey (justincc)
251fd8c948
Apply patch to reduce git revision text length if running sim directly from a git tree
...
See http://opensimulator.org/mantis/view.php?id=4030
Thanks ChrisDown (and Bruce for reporting)
2009-11-27 18:24:21 +00:00
Melanie
bd3b9f79c2
Update CM version
2009-11-26 17:59:28 +00:00
Justin Clark-Casey (justincc)
52dc9ec003
Bump trunk version number to 0.6.9.
...
This is a place holder name and not necessarily the version number that will be used
2009-11-26 19:00:57 +00:00
Jeff Ames
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
Justin Clark-Casey (justincc)
7166f3748a
minor: correct error messages when queryfolder fails
2009-11-18 18:44:47 +00:00
Justin Clark-Casey (justincc)
47e482217e
minor: remove duplicate copyright notice in PollServiceWorkerThread
2009-11-18 16:28:00 +00:00
John Hurliman
b2ed348aa2
Implemented a Watchdog class. Do not manually create Thread objects anymore, 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
2009-10-22 12:33:23 -07:00
Melanie
1e71e3f910
Remove the "mel_t" from version string
2009-10-22 07:03:40 +01:00
Melanie
9ec55df988
Mark new version
2009-10-22 01:51:27 +01:00
John Hurliman
fdce1be3db
* Removed OpenSim.Data.NHibernate
...
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
2009-10-19 16:52:27 -07:00