Commit Graph

40 Commits

Author SHA1 Message Date
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
4c2ece3bcb HG LinkRegion receive region size also. Useless since olde r gatekeepers dont send it 2016-11-20 04:22:00 +00:00
UbitUmarov
52a80f1742 workaround potencial memory leak 2016-08-22 05:47:19 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Oren Hurvitz
abe0f4a088 When preparing a Hypergrid teleport, tell the receiving grid which user is entering the grid.
This can affect which region to use. E.g., returning users may be allowed to enter any region, whereas users from other grids will have to enter a gateway region. Previously per-user decisions were only made later, but by then it's too late to change which region the user enters.
2014-04-06 15:40:45 +01:00
Oren Hurvitz
6d2893be67 When teleporting using Hypergrid, show more informative error messages in case of error 2014-04-03 14:13:03 +01:00
Mic Bowman
674a3a5639 Enable the simulator to handle region size information returned from
a hypergrid gatekeeper. Fields are "size_x" and "size_y". Server side
will be updated separately.
2014-01-23 16:20:18 -08:00
Melanie
f70357eaa3 Merge branch 'master' into careminster
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
2013-06-23 01:59:57 +01:00
Diva Canto
4778d67005 Finally moved HG agent transfers to use agent fatpacks. 2013-06-21 20:52:46 -07:00
Melanie
415b89f434 Merge branch 'master' into careminster 2012-11-09 22:58:42 +00:00
Diva Canto
eb273b808e HG: Hopefully this fixes the issues with port 80 once and for all. 2012-11-07 19:59:54 -08:00
Melanie
464fb2533f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
	OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
2012-04-20 16:48:43 +01:00
Justin Clark-Casey (justincc)
4ac2f839bd Remember to dispose of the bitmap opened from a file in GatekeeperServiceConnector.GetMapImage() 2012-04-20 03:32:38 +01:00
Melanie
af55eda16b Merge branch 'master' into careminster-presence-refactor 2011-05-03 14:26:18 +01:00
Diva Canto
51d0b8b4e9 Oops, forgot this one. 2011-05-02 09:06:21 -07:00
Diva Canto
21dedb573b HG map tile fetch: handle cached images appropriately. 2011-01-06 12:48:28 -08:00
Mic Bowman
e0da281e3d Cleaned up debugging messages in the WebRequest handlers 2011-01-03 17:16:22 -08:00
Mic Bowman
df5e4a1e5b Standardize the way WebRequests are made in the SimulationServiceConnector. Added
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
Diva Canto
4357288a94 More on mantis #5270 2010-12-14 11:24:23 -08:00
Marck
a4588befb7 Changed logging level for message about failure to retrieve a map image from a linked region. 2010-12-13 22:00:34 +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
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
d4144bedb8 * change the data exchanged within hypergrid transactions 2010-10-21 23:22:15 -04:00
Jonathan Freedman
94684a2251 * remove some spurious debug info 2010-10-20 02:36:59 -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
Jeff Ames
f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
Diva Canto
5bbf793f9e One last tweak, hopefully. 2010-09-03 10:01:18 -07:00
Diva Canto
77384eb28b Another tweak. Sux^2 2010-09-03 09:26:33 -07:00
Diva Canto
85e9160552 More tweaks related to my previous commit. Tweaks sux. 2010-09-03 09:02:08 -07: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
Justin Clark-Casey (justincc)
74e5fe5aa9 Remove various warnings and improve logging messages. No functional changes. 2010-08-23 22:24:23 +01:00
Diva Canto
1955b79759 Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer. 2010-08-19 18:55:30 -07:00
Jeff Ames
f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
John Hurliman
df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00
John Hurliman
7665aad002 * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it 2010-02-22 13:27:17 -08:00
Diva Canto
00f7d622cb HG 1.5 is in place. Tested in standalone only. 2010-01-28 19:19:42 -08:00
Diva Canto
7c00469cd2 Added ExternalName config on Gatekeeper. 2010-01-27 08:00:29 -08:00
Diva Canto
48b03c2c61 Integrated the hyperlinking with the GridService. 2010-01-24 14:30:48 -08:00
Diva Canto
fd64823466 * Added missing GatekeeperServiceConnector
* Added basic machinery for teleporting users home. Untested.
2010-01-18 10:37:11 -08:00