Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-19 | 2 | -2/+12 |
|\ | |||||
| * | If GridService.GetNeighbours() could not find the region then log a warning ↵ | Justin Clark-Casey (justincc) | 2011-02-18 | 1 | -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. | Marck | 2011-02-16 | 1 | -1/+1 |
| | | |||||
* | | Fix merge issues | Melanie | 2011-02-07 | 1 | -48/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 2 | -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 me | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -1/+1 |
| | | |||||
| * | Bug fixed on map search for HG. Affected queries that had a region name at ↵ | Diva Canto | 2011-02-04 | 1 | -4/+10 |
| | | | | | | | | the end. | ||||
| * | minor: Correct misspelling of neighbour in log messages. | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -1/+1 |
| | | | | | | | | Thanks Fly-Man- | ||||
| * | Make HG map search consistent with new syntax for link-region, i.e. ↵ | Diva Canto | 2011-01-07 | 1 | -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 Canto | 2011-01-06 | 1 | -1/+1 |
|/ | |||||
* | More changes to the long help text for console command link-region. | Marck | 2010-12-20 | 1 | -3/+3 |
| | |||||
* | Make long help text for new link-region command syntax more explicit. | Marck | 2010-12-19 | 1 | -1/+1 |
| | |||||
* | Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink. | Marck | 2010-12-13 | 1 | -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. | Marck | 2010-12-10 | 1 | -64/+41 |
| | |||||
* | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 1 | -1/+1 |
| | | | | command. mantis #5259 | ||||
* | Minor bug fixes. Hunting down mantis #5259 | Diva Canto | 2010-12-09 | 1 | -1/+3 |
| | |||||
* | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -4/+6 |
| | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
* | * better semantics for link-region command | Jonathan Freedman | 2010-10-30 | 1 | -21/+21 |
| | | | | * actually parse name for new link-region command | ||||
* | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -23/+29 |
|\ | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs | ||||
| * | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵ | Marck | 2010-10-28 | 1 | -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-22 | 2 | -62/+20 |
|/ | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
* | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 1 | -17/+56 |
| | |||||
* | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-18 | 1 | -1/+1 |
|\ | |||||
| * | Change substring matching to prefix matching in region search. This affects | Melanie | 2010-10-18 | 1 | -1/+1 |
| | | | | | | | | both map and login, as they use the same method. | ||||
* | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 1 | -14/+4 |
| | | |||||
* | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 2 | -4/+7 |
| | | |||||
* | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -2/+12 |
|/ | |||||
* | Quick fix for making global references for gatekeepers that are not ↵ | Diva Canto | 2010-09-02 | 1 | -13/+16 |
| | | | | domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now. | ||||
* | Enforce DB limits on region name to 32 chars, or else (not good). Removed a ↵ | Diva Canto | 2010-08-10 | 1 | -23/+2 |
| | | | | piece of code from Hyperlinker that didn't work anyway. Shortened the hyperlink region name. | ||||
* | Added Check4096 config var under [GridService], at the request of many. ↵ | Diva Canto | 2010-08-06 | 2 | -22/+31 |
| | | | | | | Changed the iteration that Marck had on the Hyperlinker. ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example. | ||||
* | Allow creation of link regions if there is an existing region within a 4096 ↵ | Marck | 2010-08-06 | 2 | -4/+46 |
| | | | | | | range. Also add GetHyperlinks() to the grid service. | ||||
* | Allow specifying default region flags. Correct a typo. | Melanie Thielker | 2010-08-04 | 1 | -1/+2 |
| | |||||
* | White space from previous commit. | Diva Canto | 2010-07-31 | 1 | -21/+21 |
| | |||||
* | Implemented console command "show hyperlinks". | Marck | 2010-07-31 | 1 | -25/+24 |
| | |||||
* | Bug fix: make m_HypergridLinker static. | Diva Canto | 2010-07-30 | 1 | -1/+1 |
| | |||||
* | Don't include hyperlinks as neighbors, even if grid operators have done the ↵ | Diva Canto | 2010-07-05 | 1 | -1/+5 |
| | | | | mistake of placing them as neighbors. This will not prevent further mess ups coming from that unsupported action. | ||||
* | Fixes mantis #4815 and #4812 | Diva Canto | 2010-06-28 | 1 | -1/+5 |
| | |||||
* | Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵ | Diva Canto | 2010-06-13 | 1 | -2/+3 |
| | | | | neighbours. | ||||
* | * Fixed spamming the assets table with map tiles. The tile image ID is now ↵ | Diva Canto | 2010-05-09 | 1 | -1/+2 |
| | | | | | | stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. * Fixed small bug with map search where the local sim regions weren't found. | ||||
* | Assorted bug fixes in hypergrid linking. | Diva Canto | 2010-05-03 | 2 | -24/+33 |
| | |||||
* | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-03-12 | 2 | -6/+5 |
| | |||||
* | Small bug fixes for making tests work. | Diva Canto | 2010-02-21 | 2 | -26/+30 |
| | |||||
* | Assorted bug fixes related to hyperlinking | Diva Canto | 2010-01-31 | 2 | -2/+4 |
| | |||||
* | Bug fix for making cross-grid login work. | Diva Canto | 2010-01-30 | 1 | -2/+6 |
| | |||||
* | Added ExternalName config on Gatekeeper. | Diva Canto | 2010-01-27 | 1 | -3/+15 |
| | |||||
* | Hypergrid map search back on, this time with a config var in the grid service. | Diva Canto | 2010-01-24 | 2 | -22/+37 |
| | |||||
* | Some method implementations were missing from LocalGridServiceConnector. | Diva Canto | 2010-01-24 | 1 | -1/+3 |
| | |||||
* | Integrated the hyperlinking with the GridService. | Diva Canto | 2010-01-24 | 2 | -2/+619 |
| | |||||
* | * Fixed misspelling of field in GridService | Diva Canto | 2010-01-18 | 1 | -1/+1 |
| | | | | * Moved TeleportClientHome to EntityTransferModule | ||||
* | Merge branch 'master' into presence-refactor | Melanie | 2010-01-16 | 1 | -10/+27 |
|\ | | | | | | | | | 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. |