ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-03 00:46:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,952 Commits 5 Branches 94 Tags
8fac7c065088d9861ba2ff772fde7f2e9c8d1003
Commit Graph

92 Commits

Author SHA1 Message Date
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
f18780d0e3 Get "show region" command in GridService to show grid co-ordinates rather than meters co-ord. 
This makes it consistent with "show regions"
Addresses http://opensimulator.org/mantis/view.php?id=5619
 2011-08-05 22:56:53 +01:00
Justin Clark-Casey (justincc)
b7f81d3492 If GetRegionByName can't match something in the local db, then search the 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 8c3eb324c4
 2011-08-02 01:06:32 +01:00
Justin Clark-Casey (justincc)
17e9d61f43 Change GridService.GetRegionByName() to only return info if there is an 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.
 2011-08-02 00:52:48 +01:00
Justin Clark-Casey (justincc)
e6fb9d74ef Revert "In GridService, have GetRegionByName() call GetRegionsByName() with a max return of 1 instead of duplicating code." 
This reverts commit 8d33a2eaa1.

Better fix will be along in a minute
 2011-08-02 00:40:23 +01:00
Justin Clark-Casey (justincc)
8d33a2eaa1 In GridService, have GetRegionByName() call GetRegionsByName() with a max return of 1 instead of duplicating code. 
This also fixes the problem where this method would not return a hypergrid region, unlike GetRegionsByName()
 2011-08-02 00:26:17 +01:00
root
5f927dc104 Merge branch 'master' into careminster-presence-refactor 2011-06-30 00:26:03 +01:00
Justin Clark-Casey (justincc)
de20f0603f Tell hypergridders when their teleports fail because of the 4096 limit 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.
 2011-06-24 19:49:05 +01:00
Melanie
326c46ba70 Merge branch 'master' into careminster-presence-refactor 2011-06-09 02:05:04 +01:00
Diva Canto
44371118a2 Made GetMapImage public in the Hyperlinker 2011-05-30 20:23:45 -07:00
Diva Canto
b81a304baa Made the GatekeeperConnector a public property. 2011-05-30 20:12:05 -07:00
Diva Canto
e14b7ec9e1 HGWorldMap: don't send map blocks of hyperlinks that are farther than 4096 cells from the current region. 2011-05-30 17:19:46 -07:00
Melanie
329fa73695 Merge branch 'master' into careminster-presence-refactor 2011-04-01 07:44:43 +01:00
Diva Canto
309eb712a3 Improvement over 2 commits ago: make the hyperlink check understand port 80. 2011-03-28 19:34:55 -07:00
Diva Canto
2d209d3844 Fix mantis #5413. WARNING: new config variable in section [GridService] of 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. 2011-03-28 16:46:04 -07:00
Melanie
4834b47679 Merge branch 'master' into careminster-presence-refactor 2011-02-19 01:59:49 +00:00
Justin Clark-Casey (justincc)
8249d77991 If GridService.GetNeighbours() could not find the region then log a warning 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
 2011-02-18 23:25:59 +00:00
Marck
5c15c5e0ff Changed default directory for storing map tile images from remote regions. 2011-02-16 18:36:40 +01:00
Melanie
6becaf65e1 Fix merge issues 2011-02-07 22:28:59 +00:00
Melanie
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
Justin Clark-Casey (justincc)
456cdee5ce minor: correct a log spelling mistake that was pointed out to me 2011-02-04 21:42:45 +00:00
Diva Canto
144f367863 Bug fixed on map search for HG. Affected queries that had a region name at the end. 2011-02-04 12:57:22 -08:00
Justin Clark-Casey (justincc)
1613d89383 minor: Correct misspelling of neighbour in log messages. 
Thanks Fly-Man-
 2011-02-04 20:51:51 +00:00
Diva Canto
8c0e156b4d Make HG map search consistent with new syntax for link-region, i.e. 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. 2011-01-07 11:38:54 -08:00
Diva Canto
21dedb573b HG map tile fetch: handle cached images appropriately. 2011-01-06 12:48:28 -08:00
Marck
711283d3ca More changes to the long help text for console command link-region. 2010-12-20 02:50:19 +01:00
Marck
2a40c8511a Make long help text for new link-region command syntax more explicit. 2010-12-19 22:59:32 +01:00
Marck
9a24c0b41c Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink. 
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.
 2010-12-13 21:20:48 +01:00
Marck
6f37290f4c Adjust hypergrid console commands to latest changes. 2010-12-10 17:48:45 +01:00
Diva Canto
cefdee8aaf Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259 2010-12-09 16:52:37 -08:00
Diva Canto
baa8ddfd26 Minor bug fixes. Hunting down mantis #5259 2010-12-09 08:28:21 -08:00
Diva Canto
72748746d5 Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB. 2010-12-05 19:43:24 -08:00
Jonathan Freedman
0a56cfbfd5 * better semantics for link-region command 
* actually parse name for new link-region command
 2010-10-30 22:51:52 -04:00
Jonathan Freedman
594f23ff22 Merge branch 'master' into mantis5110 
Conflicts:
	OpenSim/Services/GridService/HypergridLinker.cs
 2010-10-29 23:46:53 -04:00
Marck
7b0d643999 HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with linked regions. 
* Added check for already occupied region coordinates.
* Optimized Check4096.
 2010-10-28 17:21:17 -07:00
Justin Clark-Casey (justincc)
fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'" 
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
 2010-10-22 23:52:07 +01:00
Jonathan Freedman
d4144bedb8 * change the data exchanged within hypergrid transactions 2010-10-21 23:22:15 -04:00
Jonathan Freedman
12128f1917 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-18 23:00:48 -04:00
Melanie
7de30cc57b Change substring matching to prefix matching in region search. This affects 
both map and login, as they use the same method.
 2010-10-18 22:59:00 +01:00
Jonathan Freedman
a2167b0f0d * more url / hg cleanup 2010-10-11 16:53:00 -04:00
Jonathan Freedman
69acf9c79b * additional serveruri cleanup 2010-10-03 18:03:53 -04:00
Jonathan Freedman
32ccc7a9d9 * refactor refactor refactor ServerURI 4 lyfe 2010-10-02 19:17:02 -04:00
Diva Canto
d96f5fa57d Quick fix for making global references for gatekeepers that are not domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now. 2010-09-02 16:36:05 -07:00
Diva Canto
7741143fb5 Enforce DB limits on region name to 32 chars, or else (not good). Removed a piece of code from Hyperlinker that didn't work anyway. Shortened the hyperlink region name. 2010-08-10 11:17:38 -07: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
Melanie Thielker
16bdb53683 Allow specifying default region flags. Correct a typo. 2010-08-04 00:31:25 +01:00
Diva Canto
c4ecbd1fb1 White space from previous commit. 2010-07-31 16:40:58 -07:00
Marck
f91ec19224 Implemented console command "show hyperlinks". 2010-07-31 16:38:23 -07:00
Diva Canto
8c7fd12d5d Bug fix: make m_HypergridLinker static. 2010-07-30 18:07:14 -07:00