8ca7938753
Adding ssl support
...
Adding ssl support for "Out of Band" applications such as the remote
admin module or Robust services
2011-05-05 19:56:54 -04:00
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01:00
507f0e9ffd
Upped VERSION_NUMBER in master to 0.7.2.
2011-04-24 16:21:01 -07:00
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28:29 +01:00
ccc26f7443
Get Viewer 2 voice working with OpenSim.
...
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
2011-04-20 01:02:40 +01:00
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
0ced677510
Revert master version number to 0.7.1 for now to make merging easier.
2011-04-07 23:22:19 +01:00
a6b1927cff
bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes branch now exists.
2011-04-06 22:05:07 +01:00
e4f143fb1c
Merge branch 'master' into careminster-presence-refactor
2011-03-21 07:57:56 +00:00
a3651eb5d0
Thanks Kevin Cozens for a patch that:
...
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
aadd0e8d42
minor: bring comment into line with code reality
2011-03-16 00:14:58 +00:00
cee5e3e264
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 14:51:13 +00:00
f54ddd88a2
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 12:56:50 +01:00
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +00:00
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
4834b47679
Merge branch 'master' into careminster-presence-refactor
2011-02-19 01:59:49 +00:00
fc84225038
XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386
2011-02-16 08:18:49 -08:00
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +00:00
3889e68c54
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
2011-02-07 22:08:53 +00:00
b20ab1063f
Added a couple of console commands to help diagnose issues:
...
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
ba8826d2b8
Fix "set log level" to once again display current log level if it's not given a parameter
...
This addresses http://opensimulator.org/mantis/view.php?id=5345
2011-02-04 17:11:35 +00:00
105deab601
Merge branch 'master' into careminster-presence-refactor
2011-01-23 23:29:25 +00:00
cb14e1d272
Update the "config get <section> <key>" command to "config get [<section>] [<key>]"
...
The config get command shows a current config value on the console.
Now, if <key> is omitted then all the values for the given section are printed.
If <section> is ommitted then all sections and all keys are printed.
Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues
2011-01-21 23:59:55 +00:00
e44ceaaea3
make "show info" and "show version" show the same version text
2011-01-21 23:07:19 +00:00
43f948d691
add current console log level to "show info"
2011-01-21 23:05:53 +00:00
b0aebc6f3d
minor: make "show info" help slightly clearer
2011-01-20 21:41:48 +00:00
a42faca5b9
With mic's permission, adjust long call time info messages to 500ms from 200ms
2011-01-19 01:13:10 +00:00
de4eaab584
Merge branch 'master' into careminster-presence-refactor
2011-01-06 19:08:15 +00:00
984a9b4085
Added more performance checks to the HTTP server. Each request
...
coming through the WebUtil fns has a request id in the header
that can match the request to the actual work done by the service
2011-01-05 14:32:00 -08:00
b1180a53dd
Merge branch 'master' into careminster-presence-refactor
2010-12-21 20:56:37 +00:00
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
45314c6622
Merge branch 'master' into careminster-presence-refactor
2010-12-06 02:54:51 +00:00
9b9ce8fb27
add more detail to the log in case of FORM Timeout
...
cause nothing relevant are in the services logs
2010-12-04 21:40:18 +00:00
ccfbce3176
Remove "OpenSimulator" from startup message
2010-11-09 16:07:43 +01:00
09ea73f7cc
Change "OpenSim" to "Careminster" and remove CM suffix.
2010-11-09 15:33:03 +01:00
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
4d1f0c5348
Support for CORS with simple requests in BaseHttpServer
2010-11-02 14:11:49 -07:00
e371d3208c
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
818ed2032a
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
...
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
2010-10-30 00:41:36 +01:00
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01:00
017b83d0a3
* remove some spurious debug info
...
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it.
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-20 22:36:29 -04:00
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
94684a2251
* remove some spurious debug info
2010-10-20 02:36:59 -04:00
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04:00
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
BlueWall