Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-06-23 | 1 | -57/+11 |
|\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * | Finally moved HG agent transfers to use agent fatpacks. | Diva Canto | 2013-06-21 | 1 | -57/+11 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | HG: Hopefully this fixes the issues with port 80 once and for all. | Diva Canto | 2012-11-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 1 | -5/+20 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | ||||
| * | Remember to dispose of the bitmap opened from a file in ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -4/+11 |
| | | | | | | | | GatekeeperServiceConnector.GetMapImage() | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Oops, forgot this one. | Diva Canto | 2011-05-02 | 1 | -1/+1 |
| | | |||||
| * | HG map tile fetch: handle cached images appropriately. | Diva Canto | 2011-01-06 | 1 | -4/+12 |
|/ | |||||
* | Cleaned up debugging messages in the WebRequest handlers | Mic Bowman | 2011-01-03 | 1 | -1/+1 |
| | |||||
* | Standardize the way WebRequests are made in the SimulationServiceConnector. ↵ | Mic Bowman | 2010-12-29 | 1 | -29/+35 |
| | | | | | | Added debugging calls for tracking performance of web requests. | ||||
* | More on mantis #5270 | Diva Canto | 2010-12-14 | 1 | -2/+3 |
| | |||||
* | Changed logging level for message about failure to retrieve a map image from ↵ | Marck | 2010-12-13 | 1 | -1/+1 |
| | | | | a linked region. | ||||
* | Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink. | Marck | 2010-12-13 | 1 | -14/+15 |
| | | | | | | 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. | ||||
* | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -14/+14 |
| | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
* | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 1 | -14/+21 |
| | |||||
* | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -15/+15 |
| | |||||
* | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -8/+6 |
| | |||||
* | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -12/+19 |
| | |||||
* | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -1/+1 |
| | |||||
* | One last tweak, hopefully. | Diva Canto | 2010-09-03 | 1 | -2/+2 |
| | |||||
* | Another tweak. Sux^2 | Diva Canto | 2010-09-03 | 1 | -2/+2 |
| | |||||
* | More tweaks related to my previous commit. Tweaks sux. | Diva Canto | 2010-09-03 | 1 | -2/+2 |
| | |||||
* | Quick fix for making global references for gatekeepers that are not ↵ | Diva Canto | 2010-09-02 | 1 | -3/+3 |
| | | | | domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now. | ||||
* | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -3/+1 |
| | |||||
* | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -0/+44 |
| | | | | untested. Committing to move to my other computer. | ||||
* | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 1 | -1/+28 |
| | |||||
* | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 1 | -1/+1 |
| | |||||
* | * Adds CreatorID to asset metadata. This is just the plumbing to support ↵ | John Hurliman | 2010-02-22 | 1 | -1/+1 |
| | | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it | ||||
* | HG 1.5 is in place. Tested in standalone only. | Diva Canto | 2010-01-28 | 1 | -90/+0 |
| | |||||
* | Added ExternalName config on Gatekeeper. | Diva Canto | 2010-01-27 | 1 | -3/+4 |
| | |||||
* | Integrated the hyperlinking with the GridService. | Diva Canto | 2010-01-24 | 1 | -0/+215 |
| | |||||
* | * Added missing GatekeeperServiceConnector | Diva Canto | 2010-01-18 | 1 | -0/+119 |
* Added basic machinery for teleporting users home. Untested. |