aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-021-30/+25
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * Bring back the Hyperlinker to the Robust console. Moved the config to ↵Diva Canto2011-12-301-30/+25
| | | | | | | | [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
* | Merge branch 'master' into bigmergeMelanie2011-11-191-3/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵Justin Clark-Casey (justincc)2011-11-191-2/+2
| | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly
| * Improve some grid region log messages to express regions at co-ordinate ↵Justin Clark-Casey (justincc)2011-11-191-3/+3
| | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000)
| * improve region deregistration log messageJustin Clark-Casey (justincc)2011-11-191-1/+4
| |
| * Don't register a region twice on both official registration and maptile ↵Justin Clark-Casey (justincc)2011-11-191-0/+1
| | | | | | | | | | | | regeneration. Maptile storage appears orthogonal to region registration
* | Merge branch 'master' into bigmergeMelanie2011-10-121-0/+7
|\ \ | |/
| * Make it possible to disable the HG linker. On non-HG systems it spits yellowMelanie2011-10-121-0/+7
| | | | | | | | spam, so it should not load unless HG is desired.
* | Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmergeMelanie2011-10-121-2/+4
|\ \ | |/
| * Tweak to language of last commit in rejecting UUID.Zero in ↵Justin Clark-Casey (justincc)2011-10-081-2/+4
| | | | | | | | | | | | | | GridService.RegisterRegion() Allowing regions with UUID.Zero causes problems elsewhere according to http://opensimulator.org/mantis/view.php?id=3426 It's probably a bad idea to allow these in any case.
* | Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmergeMelanie2011-10-121-0/+2
|\ \ | |/
| * GridService - Region UUID can not be NULLPixel Tomsen2011-10-081-0/+2
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3426
* | Resolve merge commits, stage 1Tom2011-09-041-8/+30
|\ \ | |/
| * Get "show region" command in GridService to show grid co-ordinates rather ↵Justin Clark-Casey (justincc)2011-08-051-2/+3
| | | | | | | | | | | | | | than meters co-ord. This makes it consistent with "show regions" Addresses http://opensimulator.org/mantis/view.php?id=5619
| * If GetRegionByName can't match something in the local db, then search the ↵Justin Clark-Casey (justincc)2011-08-021-6/+27
| | | | | | | | | | | | hypergrid if that functionality has been enabled. This should fix the problem today where old style HG addresses (e.g. "hg.osgrid.org:80:Vue-6400") stopped working since 8c3eb324c4b666e7abadef4a714d1bd8d5f71ac2
| * Change GridService.GetRegionByName() to only return info if there is an ↵Justin Clark-Casey (justincc)2011-08-021-1/+1
| | | | | | | | | | | | | | exact region name match, unlike GetRegionsByName() This should fix the first part of http://opensimulator.org/mantis/view.php?id=5606, and maybe 5605. Thanks to Melanie for helping with this.
| * Revert "In GridService, have GetRegionByName() call GetRegionsByName() with ↵Justin Clark-Casey (justincc)2011-08-021-5/+4
| | | | | | | | | | | | | | | | a max return of 1 instead of duplicating code." This reverts commit 8d33a2eaa10ed75146f45cca4d6c19ac814d5fee. Better fix will be along in a minute
| * In GridService, have GetRegionByName() call GetRegionsByName() with a max ↵Justin Clark-Casey (justincc)2011-08-021-4/+5
| | | | | | | | | | | | return of 1 instead of duplicating code. This also fixes the problem where this method would not return a hypergrid region, unlike GetRegionsByName()
* | Merge branch 'master' into careminster-presence-refactorroot2011-06-301-56/+59
|\ \ | |/
| * Tell hypergridders when their teleports fail because of the 4096 limit ↵Justin Clark-Casey (justincc)2011-06-241-56/+59
| | | | | | | | | | | | | | | | | | | | | | rather than just saying "destination not found" Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module This allows us to explicitly tell the hypergridder why the teleport failed (region out of range). It also allows people on regions that are within range (on a large source grid) to teleport. The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit. It could also be decreased. The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-2/+9
|\ \ | |/
| * Made GetMapImage public in the HyperlinkerDiva Canto2011-05-301-5/+5
| |
| * Made the GatekeeperConnector a public property.Diva Canto2011-05-301-0/+4
| |
| * HGWorldMap: don't send map blocks of hyperlinks that are farther than 4096 ↵Diva Canto2011-05-301-1/+4
| | | | | | | | cells from the current region.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-011-1/+36
|\ \ | |/
| * Improvement over 2 commits ago: make the hyperlink check understand port 80.Diva Canto2011-03-281-4/+29
| |
| * Fix mantis #5413. WARNING: new config variable in section [GridService] of ↵Diva Canto2011-03-281-0/+10
| | | | | | | | the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-192-2/+12
|\ \ | |/
| * If GridService.GetNeighbours() could not find the region then log a warning ↵Justin Clark-Casey (justincc)2011-02-181-1/+11
| | | | | | | | | | | | rather than causing a null reference on the normal log line This also extends the TestChildAgentEstablished() test to actually activate the EntityTransferModule, though the test is not yet viable
| * Changed default directory for storing map tile images from remote regions.Marck2011-02-161-1/+1
| |
* | Fix merge issuesMelanie2011-02-071-48/+7
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-072-3/+18
|\ \ | |/ | | | | | | | | | | | | | | 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
| * minor: correct a log spelling mistake that was pointed out to meJustin Clark-Casey (justincc)2011-02-041-1/+1
| |
| * Bug fixed on map search for HG. Affected queries that had a region name at ↵Diva Canto2011-02-041-4/+10
| | | | | | | | the end.
| * minor: Correct misspelling of neighbour in log messages.Justin Clark-Casey (justincc)2011-02-041-1/+1
| | | | | | | | Thanks Fly-Man-
| * Make HG map search consistent with new syntax for link-region, i.e. ↵Diva Canto2011-01-071-38/+42
| | | | | | | | http://foo.org. Old syntax (foo.org) is still supported, but has surprising results when ppl search again, because internally the HG link names start with http.
| * HG map tile fetch: handle cached images appropriately.Diva Canto2011-01-061-1/+1
|/
* More changes to the long help text for console command link-region.Marck2010-12-201-3/+3
|
* Make long help text for new link-region command syntax more explicit.Marck2010-12-191-1/+1
|
* Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink.Marck2010-12-131-34/+42
| | | | | | Configuration option AssetService in section [GridService] must be set to enable this functionality. Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270.
* Adjust hypergrid console commands to latest changes.Marck2010-12-101-64/+41
|
* Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵Diva Canto2010-12-091-1/+1
| | | | command. mantis #5259
* Minor bug fixes. Hunting down mantis #5259Diva Canto2010-12-091-1/+3
|
* Fixed some inconsistency with trailing /. Made debug messages consistent. ↵Diva Canto2010-12-051-4/+6
| | | | Changed the stored region names of HG regions. Increased the size of regionName in DB.
* * better semantics for link-region commandJonathan Freedman2010-10-301-21/+21
| | | | * actually parse name for new link-region command
* Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-23/+29
|\ | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs
| * HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵Marck2010-10-281-20/+27
| | | | | | | | | | | | | | linked regions. * Added check for already occupied region coordinates. * Optimized Check4096.
| * Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-222-62/+20
|/ | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
* * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-211-17/+56
|
generated by cgit v1.1 at 2024-12-17 19:50:36 +0000