Commit Graph

266 Commits (cfd39238684b64b66f2f469e803cef409d0dde6f)

Author SHA1 Message Date
Melanie 6306578fcf Merge branch 'master' into careminster-presence-refactor 2011-01-18 01:28:50 +00:00
Diva Canto f73c90c633 Put the 'new' back to avoid a warning. Yes, we want to hide it. 2011-01-17 17:52:03 -08:00
Justin Clark-Casey (justincc) 3083c517a0 minor: resolve some mono compiler warnings 2011-01-18 00:29:10 +00:00
Diva Canto 4bcee1dfb4 Revert "DEBUG DEBUG DEBUG"
This reverts commit 59c2cd04ba.
2011-01-17 13:07:02 -08:00
Diva Canto 59c2cd04ba DEBUG DEBUG DEBUG 2011-01-17 12:35:19 -08:00
Diva Canto e80bcc0049 Improved debug messages to track what is going on with the XFF header 2011-01-09 16:52:41 -08:00
Melanie 3b50066ceb Merge branch 'master' into careminster-presence-refactor 2010-12-30 01:40:38 +00:00
Myan Thor 915c0b17b0 fixes a problem with ending slashes in GatekeeperService to verify session-addresses 2010-12-29 06:03:43 -08: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
Melanie d2ff4ebf2d Merge branch 'master' into careminster-presence-refactor 2010-12-13 20:19:10 +00:00
Melanie 8aa63093b1 Merge branch 'master' into careminster-presence-refactor 2010-12-12 01:20:46 +00: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
Melanie 45314c6622 Merge branch 'master' into careminster-presence-refactor 2010-12-06 02:54:51 +00:00
Jonathan Freedman 45cd2e3ef9 Merge branch 'master-core' into mantis5110 2010-12-05 11:49:15 -08:00
Melanie ce1aedf474 Add a missing interface memeber to the new HG stuff 2010-12-03 07:04:07 +01:00
Diva Canto 7d24dbca3c Added some comments. Better than listening to the boring speaker... 2010-12-01 16:01:22 -08:00
Diva Canto f3835fe15c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-29 09:58:20 -08:00
Diva Canto f86c438653 Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. 2010-11-29 08:43:33 -08:00
Marck 947d730b56 Make gatekeeper's address check case-insensitive. 2010-11-27 09:18:39 +01:00
Diva Canto 3292a22558 Creator information preserved upon HG transfers. 2010-11-26 22:06:34 -08:00
Diva Canto ae4b02e115 WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. 2010-11-25 11:14:16 -08:00
Jonathan Freedman 5ddb8b535e * a bit of additional debugging: 2010-10-23 00:18:19 -04: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 a2167b0f0d * more url / hg cleanup 2010-10-11 16:53:00 -04:00
Jonathan Freedman 8f1acb890a Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-05 14:17:18 -04:00
Diva Canto 0772e19af2 Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there. 2010-10-03 20:01:59 -07:00
Jonathan Freedman 32ccc7a9d9 * refactor refactor refactor ServerURI 4 lyfe 2010-10-02 19:17:02 -04:00
John Hurliman b6e0563ad7 Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior 2010-09-29 14:34:02 -07:00
Diva Canto a39ea07158 Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. 2010-08-19 19:54:40 -07: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
Diva Canto d5c24241b7 Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG) 2010-08-15 17:25:27 -07:00
Diva Canto 53fb799778 Further bug fixing, still related to the issue earlier. 2010-08-03 18:19:40 -07:00
Diva Canto 3c5983d8bd Another bug fixed. Same issue. 2010-08-03 17:29:17 -07:00
Diva Canto dd0ebbfb1f this is so bad, brain is beyond fried. must stop. 2010-08-03 17:05:48 -07:00
Diva Canto dd688a5994 sigh. fried brain. 2010-08-03 16:59:34 -07:00
Diva Canto 87046652b1 One more buglet related to the issue at hand. 2010-08-03 16:33:56 -07:00
Diva Canto ee068dd243 One more thing related to the previous commit. Must avoid all in-process remote calls. 2010-08-03 16:27:11 -07:00
Diva Canto 239478f3a9 Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, but it clears up the circular dependency issue between Gatekeeper and UserAgents that had made me resort to in-process remote calls, which, in turn, were hitting bugs down there somewhere in mono.
NOTE: CONFIGURATION CHANGE IN ROBUST.HG.INI.EXAMPLE !!!###!!!
2010-08-03 16:02:52 -07:00
Diva Canto 8ab7d80b09 Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network. 2010-07-30 14:04:13 -07:00
Diva Canto e5e52e4072 This combination is working. It all points to not being able to use 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing. 2010-05-15 20:27:25 -07:00
Diva Canto 74b23ff9c6 Almost, but not quite. Commenting verification again, until I understand where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets. 2010-05-15 19:58:30 -07:00
Diva Canto 2a1e45f657 Finalized the client's TCP IP address verification process for HG1.5. 2010-05-15 19:25:14 -07:00
Diva Canto c1fe07b022 * Added missing loggout notification to home grid upon agents logging out in foreign grids.
* Added missing config in StandaloneHypergrid.ini
2010-05-08 12:21:17 -07:00
Diva Canto a58859a0d4 GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
Diva Canto b10811a13b Assorted bug fixes in hypergrid linking. 2010-05-03 09:50:55 -07:00
Jeff Ames f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
Diva Canto 679ad95750 List of friends now retrieved upon login. Configured and tested in standalone only. 2010-02-25 16:11:04 -08:00
Diva Canto 11ed5dee3b Commenting UserAgentService.VerifyClient(UUID sessionID, string token) for now until I understand better the client IP issue. 2010-02-02 19:41:46 -08:00
Diva Canto 7896965d71 Batter debug messages. 2010-01-31 22:40:06 -08:00
Diva Canto 35a245b67a Assorted bug fixes related to hyperlinking 2010-01-31 22:35:23 -08:00
Diva Canto 35de8e91ec * Remove unnecessary debug message
* Bug fix in UserAgentService, logout
2010-01-31 17:27:56 -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 5feeea00ae Check for impersonations at the Gatekeeper. 2010-01-18 17:00:06 -08:00
Diva Canto 3d53694415 Go Home works. With security!! 2010-01-18 16:34:23 -08:00
Diva Canto fd64823466 * Added missing GatekeeperServiceConnector
* Added basic machinery for teleporting users home. Untested.
2010-01-18 10:37:11 -08:00
Diva Canto b5fcb5e872 HG teleports through gatekeeper are working. 2010-01-17 20:10:42 -08:00
Diva Canto b2e6ec9e12 Agent gets there through the Gatekeeper, but still a few quirks to fix. 2010-01-17 18:04:55 -08:00
Diva Canto f276ba57bf HG agent transfers are starting to work. Gatekeeper handlers are missing. 2010-01-17 11:33:47 -08:00
Diva Canto 724b1d152b Copyright notices. 2010-01-17 08:42:08 -08:00
Diva Canto a7309d90da * Added ServiceURLs to AgentCircuitData.
* Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini.
2010-01-17 08:40:05 -08:00
Diva Canto bd4d94a4f5 Hyperlinking minimally tested and working. 2010-01-17 07:54:03 -08:00
Diva Canto 04e29c1bac Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet. 2010-01-16 21:42:44 -08:00