Commit Graph

50 Commits (2a01173715e8adc9ea2f263221aed1302ed7675f)

Author SHA1 Message Date
UbitUmarov 7e751d5010 replace no thread safe code 2016-09-19 12:39:22 +01:00
Robert Adams e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
Diva Canto d00f73c3a4 Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework. 2015-09-04 14:39:23 -07:00
UbitUmarov 371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
BlueWall 10a8d2852e OpenSimExtras
Move the experimental extra features functionality into the GridService. This sends default values for map, search and destination guide, plus ExportSupported control to the region on startup. Please watch http://opensimulator.org/wiki/SimulatorFeatures_Extras for changes and documentation.
2014-08-06 17:25:12 -04:00
Diva Canto 20f20895cf Adds optional HTTP Basic Authentication to Robust service connectors. 2014-05-23 16:19:43 -07:00
Melanie 2f365ea80b Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2013-09-07 13:54:19 +01:00
Justin Clark-Casey (justincc) 4cbadc3c49 Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins.
This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators.
This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified
then existing configured defaults will still work.
Immediate use is for conference where we need to be able to specify different defaults
However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
2013-09-02 17:27:45 +01:00
Melanie a90822f4b8 Merge branch 'master' into careminster 2012-05-10 00:42:10 +01:00
Justin Clark-Casey (justincc) d8a78374aa Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the actual class names.
This is usually because the file name was singular (*Service*) but the class name was plural (*Services*).
This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector.
This does not affect existing configuration since the files are being renamed rather than the classes.
2012-05-09 23:25:01 +01:00
Melanie 4a67e8b98f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Interfaces/IEstateModule.cs
2012-04-11 23:35:27 +01:00
Justin Clark-Casey (justincc) 4ab479bf58 Add uri to various log messages when region registration fails. Upgrade some debug log messages to error. 2012-04-10 20:40:59 +01:00
Melanie 95f43ab73e Add a cache on GridService requests 2012-02-24 18:17:30 +01:00
Justin Clark-Casey (justincc) 1f402fdf5e Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an exception in service connectors 2012-02-07 21:40:28 +00:00
Diva Canto 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
Diva Canto 6386dfd362 No need for these methods to be virtual now. 2010-12-27 16:26:29 -08:00
Diva Canto 0090534793 Added Check4096 config var under [GridService], at the request of many. Changed the iteration that Marck had on the Hyperlinker.
ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
2010-08-06 17:43:09 -07:00
Marck 7e47ab746e Allow creation of link regions if there is an existing region within a 4096 range.
Also add GetHyperlinks() to the grid service.
2010-08-06 17:02:03 -07:00
Diva Canto 19558f380a Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours. 2010-06-13 19:06:22 -07:00
Diva Canto b10811a13b Assorted bug fixes in hypergrid linking. 2010-05-03 09:50:55 -07:00
Diva Canto 8466f13976 Bug fix for getting region flags. 2010-02-01 07:53:55 -08:00
Diva Canto 0c81966c0a Works for grid login. 2010-01-29 09:12:22 -08:00
Diva Canto 6dceb8b4a9 These 2 were moved to corresponding Hypergrid folders. The server connector was renamed to Gatekeeper, because it will have all the handlers for the gatekeeper. 2010-01-17 07:37:43 -08:00
Diva Canto 04e29c1bac Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet. 2010-01-16 21:42:44 -08:00
Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
Diva Canto 4bae547ecb Added the 2 missing methods in the grid service remote connections. 2010-01-14 06:36:39 -08:00
Melanie 482dcb7e89 Fix a bad error message 2010-01-13 03:59:35 +00:00
Melanie e3a04fcb7b Change the error messages on region region registration. This changes URM
and region. The non-error case should be compatible, so no version bump.
Untested.
2010-01-13 03:08:34 +00:00
Melanie 28d6705358 Preliminary work on the new default region setting mechanism 2010-01-09 20:46:32 +00:00
Melanie cbe434149e Change the signature of the forms requester data in preparation to getting
to where lists can be sent as requests
2010-01-05 03:17:37 +00:00
Melanie 9cef5f92a1 Change the signature of the forms requester data in preparation to getting
to where lists can be sent as requests
2009-12-27 03:31:53 +00:00
Diva Canto 4a33ee9fb9 Bug fix: set the map image upon hyperlinking regions. 2009-12-21 08:55:12 -08:00
Diva Canto 26e3a8ee4b * Bug fix in HG: preserve the home region coordinates across multiple HG TPs.
* Removed unnecessary debug messages.
2009-12-19 10:16:07 -08:00
John Hurliman afef1ac191 Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen 2009-11-05 13:10:58 -08:00
Melanie 48826fcdf7 Remove debug again 2009-10-07 19:22:27 +01:00
Melanie a0b6cc3861 Enable debugging of the region connector's query string 2009-10-07 19:10:18 +01:00
Diva Canto 05b80185b9 More debug to try to diagnose a problem with region registration. 2009-10-05 11:49:21 -07:00
Diva Canto 6653a30487 Fixed bug in HG that was causing secondlife:// refs to bomb the client.
Also fiddled a bit more with the initial CAP in the user server.
2009-09-28 20:58:21 -07:00
Diva Canto 9bdb585a93 Added Protocol versions back, this time in a range model. 2009-09-28 10:56:05 -07:00
Diva Canto f4bf581b96 Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
Fixed small bugs with hyperlinked regions' map positions.
2009-09-26 21:00:51 -07:00
Diva Canto dcfd08b8dd Fixed a bug with link-region. 2009-09-26 11:01:18 -07:00
Diva Canto 295868033f Better error handling on the client-side grid connector. 2009-09-25 07:47:58 -07:00
Diva Canto 1faaa0a43a GridServerPostHandler finished. GridClient tests all work. More guards on getting parameters and replies over the wire. 2009-09-24 15:30:00 -07:00
Diva Canto 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
Diva Canto 2824bbc47b Changed name of the hyperlink XMLRPC method to linkk-region, so that it doesn't conflict with the existing one. 2009-09-24 05:48:35 -07:00
Diva Canto 67276589c8 Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
Added grid configs to standalones.
2009-09-23 17:20:07 -07:00
Diva Canto 882d2c9cc3 Added hg console commands to the module.
Added the IN connector module for link-region and corresponding handler to be used in the regions only. No service as such is needed.
This will replace the current link-region machinery. Compiles but not tested.
2009-09-22 20:25:00 -07:00
Diva Canto ffd30b8ac3 Moved RegionName from RegionInfo to SimpleRegionInfo. 2009-09-22 14:46:05 -07:00
Diva Canto 34f4738159 Added HGGridConnector and related code. 2009-09-22 11:58:40 -07:00
Diva Canto 390137d540 Added grid handler and grid remote connector. 2009-09-21 11:05:01 -07:00