Commit Graph

388 Commits (63c3c7483f2b423f9d9d59714a7d528e898d9f5d)

Author SHA1 Message Date
lbsa71 b773a3a02f * We have strand flavours.
* The version string is now reported as "OpenSim 0.6.5 (Dev)"
* This has to be administrated manually.
2009-05-26 16:18:41 +00:00
lbsa71 5d23ecebeb * Introduced GetVersionString so we can harness the whole thing.
* Introduced 'Flavour' to spice things up.
2009-05-26 16:01:06 +00:00
lbsa71 f76615a66d * slowly getting there... 2009-05-26 15:46:09 +00:00
lbsa71 1cfcace30f * Changed Version to property for great justice 2009-05-26 15:43:43 +00:00
lbsa71 bac1194391 * Added test to make sure version info is 27 chars long (still don't know exactly why it has to be that, though) 2009-05-26 15:35:55 +00:00
Justin Clarke Casey 582c20b1c4 * reseparate inventory item creator id and creator uuid
* unfortunately, while the client requires uuids and we want to be able to have arbitrary string ids, these cannot be kept in sync
* I think the problems last time were due to a serialization change
* So the major inteface version has been bumped to take care of any lingering issues here.
* This means that region servers beyond this revision can only connect to similarly uptodate grid services, and vice versa
2009-05-25 19:54:47 +00:00
lbsa71 ba360ede8b * Upped version number to 0.6.5 2009-05-25 11:43:56 +00:00
Adam Frisby e9ea959263 * Pipes IPEndPoint through all Login methods, including LLSD/OSD login paths. 2009-05-23 06:14:02 +00:00
Adam Frisby 31baeef469 * Pipes requestors IP address through all XmlRpcRequest delegates. This is needed to be able to 'NAT-wrap' the login sequence.
* If you have something using XmlRpc that isn't in core, change your method signature from:
   (XmlRpcRequest request)
to:
   (XmlRpcRequest request, IPEndPoint remoteClient)
2009-05-23 06:05:20 +00:00
Dr Scofield 1d02636c27 cleaning out warnings.
NOTE: we currently have a gazillion warnings caused stuff flagged as
"obsolete" (OGS1 stuff) --- what's up with that?
2009-05-22 14:57:00 +00:00
Dr Scofield ac2fe53e89 adding RemoveXmlRpcHandler to IHttpServer 2009-05-22 11:37:14 +00:00
Melanie Thielker 4065ebff15 Remove the pre-log4net, discrete output methods from the consoles 2009-05-20 13:50:33 +00:00
Jeff Ames e0bc5c5db2 Add copyright headers, formatting cleanup. 2009-05-20 01:32:06 +00:00
diva 99167c68b1 Bug fix on POST asset so that the new asset service connector can talk to the old asset server. 2009-05-15 21:11:37 +00:00
lbsa71 95d87244b0 * Moved BaseRequestHandlerTestHelper to OpenSim.Tests.Common.Setup for great justice. 2009-05-14 08:21:14 +00:00
lbsa71 40e95cab02 * Added some more tests to the GetAssetStreamHandlers 2009-05-13 17:11:53 +00:00
Charles Krinke a5feb0682a Thank you kindly, BlueWall sir, for a patch that:
Adding a jsonp wrapper to the user supplied status report 
uri if the key "callback" exists. It will work with many 
javascript toolkits to provide an ajax callback to allow 
the browser to update stats reports without the 
intervention of an intermediate server.
2009-05-13 01:27:23 +00:00
Jeff Ames 5164403676 Update svn properties. 2009-05-11 15:14:15 +00:00
Melanie Thielker a983f2a3ac Create SynchronousRestObjectRequester and make SynchronousRestObjectPoster
use that. Mark SynchronousRestObjectPoster.BeginPostObject as obsolete.
2009-05-10 16:31:10 +00:00
Melanie Thielker dc4f31db1a Create an async form of the RestObjectPoster. Rename the file (but not the
class!) to SynchronousRestObjectRequester. Add CacheBuckets parameter to
cache
2009-05-10 16:20:25 +00:00
Melanie Thielker b3d29aaeb3 Make remote assets work through the new server system 2009-05-09 04:03:32 +00:00
lbsa71 54b5346f16 * Extracted common superclass for GetAssetStreamHandler and CachedGetAssetStreamHandler
* Added some more tests
2009-05-08 15:44:35 +00:00
lbsa71 8ac73be917 * Introduced new HttpServer.Tests project
* Split the GetAssetStreamHandler testing into separate tests for BaseRequestHandler
* Ignored some gens
2009-05-08 06:11:44 +00:00
Sean Dague f532767c6a fix svn properties 2009-05-08 00:47:32 +00:00
Sean Dague ce0a84cbc0 instrument most of the tests with a new InMethod function that may help us figure
out where that pesky deadlock is during test runs.
2009-05-07 19:07:08 +00:00
lbsa71 f3db3d6a00 * Added some more GetAssetStreamHandlerTests
* In the process, caught a potential bug where the handler would allow paths not starting with the registered prefix
2009-05-07 06:31:16 +00:00
lbsa71 1afdf2ee1f * Added some GetAssetStreamHandlerTests
* Minor tweaks to attain testability
2009-05-06 17:02:51 +00:00
Jeff Ames 07d680a010 Remove bin directory from HttpServer. 2009-05-05 09:31:49 +00:00
Melanie Thielker 7f1c393bc3 Remove the csproj files that got into SVN 2009-05-04 21:05:15 +00:00
Melanie Thielker ec0d2c28fa Committing the changed tree 2009-05-04 20:19:21 +00:00
Melanie Thielker acfb5051cd Intermediate commit. WILL NOT COMPILE! 2009-05-04 20:15:39 +00:00
Melanie Thielker 1b877234da Refactor. Make ConsoleBase a true base class. Create CommandConsole as a simple
console capable of processing commands. Create LocalConsole as a console
that uses cursor control and context help. Precursor to a distributed
console system for the new grid services. No functional change intended :)
2009-05-04 12:15:55 +00:00
Charles Krinke 280d2cbf4a Thank you kindly, BlueWall, for a patch that:
Move json stats to non-published resource name
Remove well-known resource name for json stats, 
creating dynamic uris with private keys and add 
a user configurable resource name for region owner usage.
2009-05-02 16:28:30 +00:00
Jeff Ames 5ede445bdf Update svn properties. 2009-05-01 05:16:05 +00:00
diva 81bc38708a Thanks Tommil for a patch that adds a caching option to GetAssetStreamHandler. It is used in the RegionAssetService. 2009-04-27 15:23:18 +00:00
Dahlia Trimble 4792e6139a Thanks Bluewall for Mantis #3519: a patch that adds simulator uptime and version to REST/json statistics reporting 2009-04-25 05:06:01 +00:00
Dr Scofield 458f7eb9b3 cleaning up, fixing warnings 2009-04-22 09:42:44 +00:00
Jeff Ames 6aa5d3904d Add copyright headers. Formatting cleanup. 2009-04-22 00:48:56 +00:00
Charles Krinke 27c8cc5b1f Thank you kindly, TLaukkan for a patch that:
Added support for loading bare asset binaries (as opposed to 
xml encoded asset base) to both sandbox asset service and cable beach.
* Added support for enabling region asset service when mxp is enabled.
* Moved base http server content type defaulting before invocation of 
request handle method to allow for variable content type in the response.
2009-04-21 19:42:36 +00:00
Charles Krinke b4cb45bb79 Fixes Mantis # 3469. Thank you kindly, BlueWall, for a patch that:
This patch adds extended status reporting with the url 
http://server:port/simstatusx/ [^] . The data is returned 
in json format as "text/plain" type.
2009-04-17 21:48:48 +00:00
Justin Clarke Casey 9f6b8ec9b0 minor: Remove some mono compiler warnings. Uncomment code when it's actually being used. 2009-04-15 19:46:37 +00:00
lbsa71 29355de6ee * Some more experimental work on distributed assets. Nothing hotwired yet.
* Introduced preprocess step in FetchAsset (Might revert this later)
  * Some minor CCC
  * Added actual implementation of GetUserProfile( uri ) and the corresponding handler to OGS1.
  * Introduced non-functioning GetUserUri( userProfile) awaiting user server wireup (this might move elsewhere)
2009-04-13 20:04:18 +00:00
Justin Clarke Casey 2176a80bcf * Terminate OpenSim startup if we cannot listen to the designated HTTP port
* This makes the problem much more obvious to the user, and OpenSim isn't that useful without inbound http anyway
2009-04-09 19:46:14 +00:00
lbsa71 958d764172 * Upped trunk version number to 0.6.4 as we just tagged 0.6.4-release 2009-04-01 19:44:46 +00:00
Melanie Thielker 76ca096384 Add a PIDFile in [Startup], which the PID will be written to 2009-04-01 12:13:42 +00:00
Dr Scofield 0bb3d2e6d7 cleanup 2009-03-25 07:36:56 +00:00
Justin Clarke Casey 8f1844665b * Group OpenSim.Framework.Servers interfaces together 2009-03-19 19:21:17 +00:00
Justin Clarke Casey bd2180d9af * refactor: Create IHttpServer interface instead of accessing BaseHttpServer via CommunicationsManager directly 2009-03-19 18:11:44 +00:00
Justin Clarke Casey b05be5b06b * Lock http handlers dictionary in other places as well to avoid race conditions
* No adverse effects on a quick multi-machine grid test
2009-03-19 17:07:00 +00:00
Justin Clarke Casey 1e6056c24b * Add necessary locking to BaseHttpServer.RemoveHTTPHandler() 2009-03-19 16:51:21 +00:00
Justin Clarke Casey eb0c369409 * Add documentation to BaseHttpServer.AddHTTPHandler() 2009-03-19 16:41:23 +00:00
Justin Clarke Casey acad0328b2 * Make all coded defaults match settings in OpenSim.ini.example
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using
* OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
2009-03-11 18:02:22 +00:00
Justin Clarke Casey dd28d6ceeb * minor: reduce some code duplication in BaseHttpServer 2009-03-10 18:22:46 +00:00
Dr Scofield c6415ef71d fixing out-of-sync error in BaseHttpServer 2009-03-10 15:51:17 +00:00
Teravus Ovares 5b8c925641 * Adding application/x-oar to the list of content types to which the HTTP Server will return the response as if it was a binary file pending discussion on the [opensim-dev] mailing list to be initiated by dmiles. 2009-03-07 06:14:31 +00:00
lbsa71 fcb737c7f9 * Upping to interface version 3 - let's see how this goes. 2009-02-21 14:12:06 +00:00
Jeff Ames 7a649a758d Add copyright headers. Minor formatting cleanup. 2009-02-21 03:32:25 +00:00
Jeff Ames b515645151 Update svn properties. 2009-02-21 03:00:17 +00:00
lbsa71 2e095f5727 * Upped VersionInfo to 0.6.3 and in the process, changed assemblyinfo to 0.6.3.* to better track down dll ref and overwrite problems. 2009-02-20 16:47:31 +00:00
lbsa71 5e39e515f9 * Another stab at removing AssetServer.exe dependencies 2009-02-20 02:26:27 +00:00
lbsa71 b99d9bdeb1 * Reverted the AssetServer fix, apparently something was dependent on IAssetDataPlugin being in OpenSim.Data 2009-02-19 19:32:53 +00:00
lbsa71 1bcc489f5b * Moved the AssetStreamHandlers to OpenSim.Framework.Servers
* And there, all refs to OpenSim.Grid.AssetServer.exe gone.

/me takes a bow.
2009-02-19 19:04:51 +00:00
Justin Clarke Casey 4550093353 * Fix http://opensimulator.org/mantis/view.php?id=3193
* Make it possible once again to set a console log level threshold in OpenSim.exe.config
2009-02-19 17:57:40 +00:00
Justin Clarke Casey 6db1f3c6a6 * Lock remaining m_rpcHandlers use since these accesses are not guaranteed to be thread safe 2009-02-12 18:54:48 +00:00
Justin Clarke Casey d29e0498ff * Apply http://opensimulator.org/mantis/view.php?id=3138
* Adds a GetXmlRPCHandler() to the BaseHttpServer
* Thanks mpallari
2009-02-12 18:01:29 +00:00
lbsa71 801da4346a * optimized usings. 2009-02-12 09:53:12 +00:00
Melanie Thielker 9bfbfa381a Add proper handling for shared vs. unshared modules to the command
interface. Shared modules will now only get added once, so the command
handler is called once per module, not once per scene. Removal of scenes
has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
Justin Clarke Casey d1d93fae6c * Restore show information for the OpenSim region server (version, info, threads, etc.) 2009-02-09 18:11:09 +00:00
Melanie Thielker 54c6a920ba Replace the console for all OpenSim apps with a new console featuring command
line editing, context sensitive help (press ? at any time), command line
history, a new plugin command system and new appender features thet let you
type while the console is scrolling. Seamlessly integrates the ICommander
interfaces.
2009-02-07 12:25:39 +00:00
Justin Clarke Casey 732cd838b1 * Make existing module commanders register as help topics
* Typing help will now give a list of these topics at the top (as well as the rest of the current help stuff)
* Typing help <topic> will give information about commands specific to that topic
2009-02-05 21:35:59 +00:00
diva cf1fd7de4a Closing the requestStream and setting a 10 sec timeout for getting it. 2009-02-04 13:13:47 +00:00
Charles Krinke bcc7a8f09c Fixes Mantis #3032. The VersionInfo.cs file was not updated from 0.6.1 to 0.6.2 with the last minor release and shows incorrectly on the console. This will resolve itself on the next svn update. 2009-01-22 15:57:47 +00:00
Justin Clarke Casey 1baa921463 * minor: remove some mono compiler warnings 2009-01-13 18:35:20 +00:00
Justin Clarke Casey 363054bb2c * minor; Very minor non-functional tidy ups 2009-01-13 18:23:37 +00:00
Justin Clarke Casey 66637ad6e7 * minor: Add a couple of code comments about enabling httpserver logging 2009-01-13 16:56:10 +00:00
Teravus Ovares fcc3325f3b * Adds the variables passed to the hashtable BaseHttpServer passes in.
* Null check on Sessions_report.
2009-01-08 22:01:57 +00:00
Justin Clarke Casey b077723a20 * minor: remove some mono compiler warnings 2009-01-05 20:58:57 +00:00
diva 19cb2cb395 Undoing the bump up of MajorInterfaceVersion number back to 2. This just doesn't work in practice! 2009-01-03 07:31:48 +00:00
diva 158de95bde Another interregion comms change that will not work well with previous versions. This commit moves InformRegionOfChildAgent from OGS1 to RESTComms, effectively having the complete child agent life cycle over REST: create=POST, update=PUT, close=DELETE.
Additional changes include more functions in the IHyperlink interface, and some refactorings in the HG code for better reuse in RESTComms.
2009-01-03 07:05:33 +00:00
Teravus Ovares e9cef70f89 * Updates the sim stats module. Cleans out some of the rot.
* Adds a prototype web stats module which is disabled by default.  It's functional with one report right now, however, the database structure may change, so I don't recommend enabling this to keep actual stats right now.  I'll let you know when it's safe.
* Adds Prototype for ajaxy web content
* removed a warning or two.
2009-01-03 03:30:03 +00:00
diva fe20ff8072 Added http-method to the hashtable that gets passed to GenericHTTPMethods. 2008-12-31 18:26:31 +00:00
Charles Krinke b1d235a60c Change VersionInfo.cs from 0.6.0 to 0.6.1 in preparation
for the 0.6.1 minor release.
2008-12-20 19:13:02 +00:00
Teravus Ovares 8f07f2e8b0 * A few more fixes to HttpServer.
* http://www.codeplex.com/webserver/WorkItem/View.aspx?WorkItemId=3110 fix erronious call to beginread that caused an exception which was caught and ignored (increase performance)
* Pass socket into httpclientcontectImp and call the disconnect + reuse method so the socket can be reused quicker (increase performance)
* Ensured that in every error scenario beginAccept is called (stability)
* Fixed header casing (standards compliance)
* Fixed Connection: close handling (standards compliance)
2008-12-20 15:09:01 +00:00
Teravus Ovares a66657f155 * Tweak my previously mentioned nasty hack so it's a little less nasty 2008-12-18 13:17:54 +00:00
lbsa71 56f1b03cd0 * Added "show queues" command that shows throttling queues for all clients.
*** This only works for LLCLientView at the moment ***
2008-12-18 13:16:41 +00:00
Teravus Ovares 0f25e8298b * Add a nasty hack to try and give the HttpServer a few extra lives until we dig more into what's causing it to stop listening. 2008-12-18 11:44:53 +00:00
lbsa71 68c53c6da0 * Caught unhandled IOException, and outputted it to log. 2008-12-18 11:39:24 +00:00
Teravus Ovares f4acaafd3a * Added more articulate logging of HttpServer so we can diagnose issues. 2008-12-18 02:42:26 +00:00
Teravus Ovares 6358c21208 * Committing an opensim level error message on httpserver. This might help with the eventqueue http server death. 2008-12-18 01:52:49 +00:00
Charles Krinke 6cf0b81864 Mantis#2811. Thank you kindly, Diva for a patch that resolves
some of our DNS/dotted decimal issues that plague teleporting.
We are increasing the MajorInterfaceVersion from 1 to 2 in the
gridserver, so sims will need to be updated on various grids.
2008-12-13 16:25:20 +00:00
MW 11169c0e71 Made BaseOpenSimServer.ShutdownSpecific() public. As the OpenSimBase.Shutdown() includes a Environment.Exit(0); which is not always wanted when shutting down, like from a windows service. 2008-12-02 11:40:22 +00:00
MW 67c260fdcc Added a Catch(InvalidOperationException) to BaseHttpServer.HandleRequest(). Which is thrown due to errors in the XML deserializing. Without this catch is it easy to bring down any of the opensim servers on purpose by just sending corrupt xml to them. 2008-12-01 11:23:27 +00:00
lbsa71 0f5112ffff * Adding the incoming url as Param[2] in the XmlRpcRequest 2008-11-25 11:45:34 +00:00
Melanie Thielker f518ca7feb Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
2008-11-19 06:25:34 +00:00
Melanie Thielker 3234472d62 Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
2008-11-19 06:15:21 +00:00
Justin Clarke Casey c25a0ea792 * Update libOMV to r2359. This is necessary for the progressive texture patch
* Update libopenjpeg as well for this patch.
* Appears to be okay on a very short sniff test
* Source code will be placed in opensim-libs shortly
2008-11-17 21:00:34 +00:00
Justin Clarke Casey 072624b19d * minor: add interface version to 'show version' command output 2008-11-17 20:22:22 +00:00
Melanie Thielker d66f3993de Add group permissions to agent inventory.
Contains a migration. May contain nuts.
Please back up your inventory data store. This revision changes the interface
version!! No older regions can connect to these new UGAIM, and the new regions
can't connect to the old UGAIM. Fixes a long-standing issue of permissions loss
Currently persisted on MySQL only.
2008-11-14 18:54:38 +00:00
Melanie Thielker 724390e413 Change HTTP server backlog/acceptors to 64, per Adam Z 2008-11-12 18:59:38 +00:00
Justin Clarke Casey 97816f8c90 * Implement basic region filtering as described in https://lists.berlios.de/pipermail/opensim-dev/2008-November/003468.html
* This is done by sending a 'major interface version' number on sim registration.  Developers must increment this every time they make a change that would make the previous 
OpenSim revision failure incompatible with the new one (non-fatal incompatibilities are fine).
* This number resides in OpenSim.Framework.Servers.VersionInfo.MajorInterfaceVersion
* This allows the grid service to stop older, incompatible regions from connecting
2008-11-11 17:02:46 +00:00