455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
3384f643eb
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
...
* Shouldn't break the build.
* Doesn't work yet either.
2010-10-14 02:19:42 -04:00
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
609375bf37
Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog
2010-09-14 22:24:11 +01:00
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
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.
2010-09-13 16:17:38 +01:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
a7f4e10f42
Remove parenthesis around the release flavour to get the version string back 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
2010-09-10 21:56:04 +01:00
06adbc1324
Revert "Workaround for mono bug #312968"
...
This reverts commit f2e343d530
2010-09-06 17:24:10 +02:00
f2e343d530
Workaround for mono bug #312968
2010-09-06 14:09:46 +02:00
09c75b30f3
Fix build break
2010-09-05 16:45:24 +01:00
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
e593607171
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:16:42 +02:00
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
4e0d6e8e41
Merge branch 'master' into careminster-presence-refactor
2010-09-03 03:37:18 +01:00
7b03cb09e4
minor: Add some method doc to BaseHttpServer.HandleRequest()
2010-08-30 22:33:45 +01:00
75e2a2b3ce
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:19:55 +01:00
739eb14741
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:18:15 +01:00
1096f43f0d
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:34:39 +02:00
1bcb2e788f
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:04:12 +02:00
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
2369063640
HACK ALERT! There's some underlying bug in the HTTP server that makes requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in.
2010-08-06 10:59:19 -07:00
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
a349703279
comment out further debug line in BaseHttpServer
2010-07-27 22:51:57 +01:00
701f39c8c2
do a whole load of crappy hacking to get cubes to display google.com
...
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
2010-07-26 23:34:17 +01:00
cea856cfc2
Fix the synchronousrestformsrequester so it will successfully handle a response from a server which does not provide a valid content length header
2010-07-10 19:00:12 -07:00
cecd660388
Fix an issue where the SynchronousRestObjectRequester will fail if a webserver does not report a content length (-1), but the content is still valid
2010-07-10 18:48:49 -07:00
5f400a50be
Merge branch 'master' into careminster-presence-refactor
2010-07-08 17:32:57 +01:00
baebefeb05
Handle a specific exception without spewing red ink.
2010-07-08 16:30:36 +01:00
7665013ad8
Correct positioning of timeout modifier in the SynchronousRestObjectRequester
2010-07-04 19:25:54 -07:00
3d495b709e
Implement a timeout value in the SynchronousRestObjectRequester. Default is 100 seconds.
2010-07-03 06:08:18 -07:00
c7e7cb04a3
fix web request exception reporting properly this time
2010-06-25 20:57:38 +01:00
8629ba80bf
Revert "Report http server onRequest() exception properly."
...
This reverts commit c09451a034
2010-06-25 20:51:21 +01:00
dc9e9931eb
Merge branch 'master' into careminster-presence-refactor
2010-06-25 20:26:48 +01:00
c09451a034
Report http server onRequest() exception properly.
2010-06-25 19:11:22 +01:00
0031d4a618
Readjust master version and flavor
2010-06-15 01:53:11 +01:00
3c3ad08868
Merge branch 'master' into careminster-presence-refactor
...
0.7.1CM Dev
2010-06-12 02:46:11 +01:00
85d2e21558
Change trunk versio to 0.7.1 Dev
2010-06-12 02:45:21 +01:00
4dd9cf1ce4
Change flavor to 0.7-RC1
2010-06-12 02:44:01 +01:00
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
565db4635f
add a smidgen more log debug information in the form of the operating system version
2010-05-28 18:30:33 +01:00
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
4b755c6d80
delete now unused MessageServerInfo
2010-05-15 02:17:10 +01:00
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
a573b5767b
Test commit
2010-04-05 22:31:30 +02:00
5c04d768a6
Bump version number
2010-04-05 22:26:18 +02:00
ba31b31ed0
Merge branch 'careminster' into careminster-presence-refactor
2010-04-05 18:22:15 +01:00
04a68db195
Merge branch '0.6.9-post-fixes' into careminster
2010-04-05 18:10:36 +01:00
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
dd544f811a
switch flavor to RC1
2010-03-26 19:09:09 +00:00
4565e5dfbc
change trunk version to 0.7.Dev
2010-03-26 18:56:05 +00:00
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
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
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
a647f50087
minor logging changes to BaseHttpServer, OSHttpRequest
2010-03-16 22:58:12 +00:00
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
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
a578feefba
very minor spacing adjustment
2010-03-11 20:20:38 +00:00
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
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
b19e564317
Restore version suffix.
2009-12-25 23:20:30 +00:00
e7439efc74
Recover out-of-region objects during db load.
2009-12-24 19:19:44 -05:00
6eecbc95e4
Merge branch 'master' into careminster
2009-12-23 21:22:19 +00:00
9c294c5663
- commented out unused method ConvertIHttpClientContextToOSHttp
2009-12-23 18:33:54 +01:00
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
e38e8ae987
Fix mantis #10 & #14
2009-12-19 19:54:44 -05:00
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
57d60a95a2
minor: make logging messages consistent in BaseHttpServer
2009-12-15 16:23:57 +00:00
0889b5aef1
Fix version number
2009-12-10 18:20:40 +00:00
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
8e089b6d8d
* Fix line endings in BaseHttpServer.cs
2009-12-05 13:23:05 -05:00
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
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
4234c64147
handle a condition where the http headers apparently have multiple remote ports designated
2009-12-02 04:10:53 -08:00
d3e7a52933
Merge branch 'master' into careminster
2009-11-28 09:26:00 +00:00
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
bd3b9f79c2
Update CM version
2009-11-26 17:59:28 +00:00
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
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
7166f3748a
minor: correct error messages when queryfolder fails
2009-11-18 18:44:47 +00:00
47e482217e
minor: remove duplicate copyright notice in PollServiceWorkerThread
2009-11-18 16:28:00 +00:00
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
1e71e3f910
Remove the "mel_t" from version string
2009-10-22 07:03:40 +01:00
9ec55df988
Mark new version
2009-10-22 01:51:27 +01:00
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
0d29614ca1
Formatting cleanup.
2009-10-19 08:58:03 +09:00
29f03d95f3
Bug fix.
2009-10-07 19:20:34 -07:00
ab3bfca546
Printout one more field in show threads, but this won't buy us much.
2009-10-07 17:29:21 -07:00
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
2753f4d62c
* GridServerPostHandler.cs: Try/catch in Handle
...
* BaseOpenSimServer.cs: Added thread pool numbers in show threads
2009-10-05 16:06:21 -07:00
75b35ddf4a
More error messages to warn when/if things go wrong.
2009-10-05 09:18:51 -07:00
f21f3727df
Leaving the MemoryStreams unclosed.
2009-10-04 09:20:01 -07:00
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
2d9c27a28f
Slightly better message with status code for WebException.
2009-10-03 20:18:21 -07:00
b6920267f0
Close was being called to early on the Memory stream.
2009-10-03 16:27:55 -07:00
df7049008a
More streams closed.
2009-10-03 08:57:30 -07:00
e1112ff879
MOre streams closed. Corrected word in GridCommon.ini.example
2009-10-03 08:46:06 -07:00
4843edfeb7
Closing more streams.
2009-10-03 08:33:19 -07:00
006dfd6d9a
Closing another stream.
2009-10-02 20:35:15 -07:00
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
e66321227e
Close streams in MakeRequest.
2009-10-02 16:23:46 -07:00
73fa409318
Merge branch 'diva-textures-osgrid'
2009-10-02 23:25:17 +01:00
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
41e4f3afdb
Remove some tests that no longer apply
2009-09-30 19:14:58 +01:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
77f5e41631
Remove empty CheckSumServer.cs file.
2009-09-29 21:21:53 +09:00
0709149313
Merge branch 'grid-service-redux'
2009-09-28 23:03:47 +01:00
7cd03abab5
Bump main version to 0.6.8-Dev
2009-09-28 18:41:21 +01:00
69da82b39f
Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which was causing an extra \n to be written into the buffer.
2009-09-28 06:44:57 -07:00
dd3d52ae1f
Added test GridClient, which allowed me to remove a few bugs out of the new code.
2009-09-24 13:33:58 -07:00
e67341f24c
minor: replace xmlprc 'no method found' magic number with constant from xmlrpc library
2009-09-24 15:02:55 +01:00
97c18caa76
Thank you, Intari, for a patch that implements the missing pieces of
...
Http-in and makes the host name for URL generation configurable.
Applied with changes:
llGetSimulatorHostname was not changed, because the change breaks
existing behavior and carries a data exposure risk. That value needs
to be configurable, the proposed fixed change is not acceptable.
2009-09-22 17:04:34 +01:00
dafe5bf05f
Completely remove the prior implementation of the request event handling
...
on poll handlers. Introduce a new delegate on the PollServiceEventArgs that
allow access to the request headers and body.
2009-09-22 06:19:02 +01:00
c5be401d46
Remove support for executing a handler on poll. It caused other issues
2009-09-22 05:24:22 +01:00
06871d51dd
Disable the handler execution for poll services until the ramifications
...
can be studied
2009-09-22 05:13:50 +01:00
b6b8a18d37
Add the headers collection to the keysvals for HTT requests
2009-09-21 20:21:01 +01:00
61aaf3532a
Add X-PollServiceID pseudo-header to the request handling for polls
2009-09-21 20:10:26 +01:00
69b76acce1
Make the poll service handler call the handler method on incoming requests.
2009-09-21 19:46:29 +01:00
bc9e4cfd96
Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
...
even hander delegates.
2009-09-21 18:11:40 +01:00
04170521f0
Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic
2009-09-21 14:59:31 +01:00
2d9d25b367
Add the skeleton of the authentication connector and the forms data requester
2009-09-19 17:33:57 +01:00
6461243e7c
Remove the methods for full inventory fetch from the connector. Remove tests
...
for the old, removed asset handlers
2009-09-17 23:55:06 +01:00
6779abf7f5
Remove The legacy inventory and asset servers. Bump interface version to 6
2009-09-17 23:39:58 +01:00
976cf4284b
Fix up WebFetchInventoryDescendents to really return all data needed,
...
especially the folder version and the subfolders. Fixes inventory search
hang and folders not loading.
2009-08-29 03:26:44 +01:00
6f077d5e5f
* Another attempt at fixing the random spurious test error.
...
* This time it might be the listening socket thread from HttpServer aborting with a non blocking thread abort exception. Hopefully calling Stop() on MainServer.Instance will solve that.
2009-08-26 21:05:46 -04:00
8a9d168928
Add try/catch around EQ request processing
...
Fixes Mantis #4061
2009-08-26 14:46:10 +01:00
cfd9cf7b18
Closed the web request and stream in SynchronousRestSessionObjectPoster -- maybe this is the cause of some timeouts seen in some monos?
2009-08-25 06:17:36 -07:00
3318652723
Added a more sane InventoryServerMoveItemsHandler. Changed SynchronousRestObjectRequester so that it also understands PUTs.
2009-08-21 11:00:45 -07:00
f1287cc7af
* Switching IAssetData to follow the new naming schema, removing the separate insert and update methods.
2009-08-19 23:45:22 +01:00
4a992388e3
Apply http://opensimulator.org/mantis/view.php?id=4016
...
Make previously hidden cookies available to code
Thanks jhurliman
2009-08-17 20:02:42 +01:00
50f29752f5
Formatting cleanup. Add copyright headers.
2009-08-13 11:48:39 +09:00
613e6f07fc
change 535cb0efc so that the default LLSD serialization format is
...
llsd+xml instead of llsd+json --- the latter seems to break existing
bots. this assumes that those bots that want llsd+json will properly
signal that desire, if that is not the case, we need to revisit
this. fixes mantis #3977 .
2009-08-12 14:49:59 +02:00
bb64906a9c
Enable the console show version command and the viewer about command, to show the last git commit hash together with the conmit date and time. The data is retrieved form a file bin/.version This file can be generated automatically using the post commit script by adding the following to the script:
...
git log -n 1 --pretty="format:%h: %ci" > bin/.version
This command can also be run manually to create the bin/.version file.
This command genrates a short form of the commit hash and a date and time of the commit in ISO8601 format.
If a full commit hash is required then change %h to %H
The logic that is used to extract the deprecated svn revision is still included.
It will be removed at a future date
2009-08-11 17:09:35 +01:00
3f06fb3601
Removing unused files, legacy from old asset "cache".
2009-08-09 17:46:37 -07:00
8b9f8709aa
* FreeContext may be a bit too buggy for my tastes in some environments. * Commenting it for the moment.
2009-08-08 14:14:52 -04:00
535cb0efc1
* Patch from jhurliman to add accept type recognition to determine the llsd content format. *should allow both json and xml serializations of llsd to work properly.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2009-08-05 16:47:48 -04:00
4ce5c894cf
Add copyright header. Formatting cleanup.
2009-08-01 05:11:47 +00:00
23a8895d29
* Fixed another potential httpserver leak.
2009-07-30 18:16:00 +00:00
07579fa402
Add basic support ofr detached request handling to the HTTP server.
...
Groundwork to finish HTTP IN.
2009-07-29 23:13:08 +00:00
83a421a562
* An attempt to fix mantis #3955
...
* It's possible it could re-cause mantis #3953 , but the FreeContext isn't always necessary because Connection: close ---> Disconnect(SocketError.Success) { FreeContext(); }
2009-07-29 21:53:18 +00:00
f727f26bcc
* An attempt to fix mantis #3953
2009-07-29 20:32:54 +00:00
50204f6ee2
* Re trigger panda
2009-07-29 02:41:00 +00:00
032aeb8b5d
* Adds the ability to have a thread efficient long poll service (such as the eventqueue)
...
* If this doesn't melt the Http Server, this will significantly reduce the number of threads in use on regions with many users.
* Adds AddPollServiceHTTPHandler, and RemovePollServiceHTTPHandler to BaseHttpServer
* Generic enough to be used for many long poll services, not only the EventQueue.
2009-07-29 02:15:45 +00:00
687e84048d
* as per my e-mail to opensim-dev archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007223.html
...
I'm bumping gridcomms interface version to 5.
MajorInterfaceVersion = 5
2009-07-25 21:16:48 +00:00
Melanie