Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 2 | -4/+5 |
|\ | |||||
| * | Put the 'new' back to avoid a warning. Yes, we want to hide it. | Diva Canto | 2011-01-17 | 1 | -1/+1 |
| | | |||||
| * | minor: resolve some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 3 | -5/+6 |
| | | |||||
| * | Revert "DEBUG DEBUG DEBUG" | Diva Canto | 2011-01-17 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 59c2cd04ba056b85eb4873e472b95826a1cc13b5. | ||||
| * | DEBUG DEBUG DEBUG | Diva Canto | 2011-01-17 | 1 | -1/+1 |
| | | |||||
| * | Improved debug messages to track what is going on with the XFF header | Diva Canto | 2011-01-09 | 1 | -5/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-30 | 1 | -3/+5 |
|\ \ | |/ | |||||
| * | fixes a problem with ending slashes in GatekeeperService to verify ↵ | Myan Thor | 2010-12-29 | 1 | -3/+5 |
| | | | | | | | | session-addresses | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-13 | 1 | -16/+13 |
|\ \ | |/ | |||||
| * | Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink. | Marck | 2010-12-13 | 1 | -16/+13 |
| | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Minor bug fixes. Hunting down mantis #5259 | Diva Canto | 2010-12-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 2 | -10/+18 |
|\ \ | |/ | |||||
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 2 | -3/+7 |
| | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 4 | -1/+592 |
| |\ | |||||
| * | | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 1 | -4/+3 |
| | | | |||||
* | | | Add a missing interface memeber to the new HG stuff | Melanie | 2010-12-03 | 1 | -0/+5 |
| |/ |/| | |||||
* | | Added some comments. Better than listening to the boring speaker... | Diva Canto | 2010-12-01 | 2 | -0/+12 |
| | | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 1 | -1/+2 |
|\ \ | |||||
| * | | Make gatekeeper's address check case-insensitive. | Marck | 2010-11-27 | 1 | -1/+2 |
| | | | |||||
* | | | Preservation of creator information now also working in IARs. Cleaned up ↵ | Diva Canto | 2010-11-29 | 2 | -42/+107 |
| | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. | ||||
* | | | Creator information preserved upon HG transfers. | Diva Canto | 2010-11-26 | 1 | -1/+0 |
| | | | |||||
* | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 2 | -0/+514 |
|/ / | | | | | | | 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. | ||||
* | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -12/+7 |
|/ | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
* | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 1 | -3/+7 |
| | |||||
* | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -1/+5 |
|\ | |||||
| * | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -1/+5 |
| | | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
* | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 2 | -5/+5 |
|/ | |||||
* | Part two of the previous commit, making IGridUserService.LoggedOut() more ↵ | John Hurliman | 2010-09-29 | 1 | -1/+1 |
| | | | | flexible without changing current behavior | ||||
* | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 2 | -12/+21 |
| | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general. | ||||
* | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -12/+32 |
| | | | | untested. Committing to move to my other computer. | ||||
* | Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG) | Diva Canto | 2010-08-15 | 1 | -1/+10 |
| | |||||
* | Further bug fixing, still related to the issue earlier. | Diva Canto | 2010-08-03 | 1 | -3/+17 |
| | |||||
* | Another bug fixed. Same issue. | Diva Canto | 2010-08-03 | 1 | -1/+2 |
| | |||||
* | this is so bad, brain is beyond fried. must stop. | Diva Canto | 2010-08-03 | 1 | -1/+1 |
| | |||||
* | sigh. fried brain. | Diva Canto | 2010-08-03 | 1 | -1/+1 |
| | |||||
* | One more buglet related to the issue at hand. | Diva Canto | 2010-08-03 | 1 | -1/+1 |
| | |||||
* | One more thing related to the previous commit. Must avoid all in-process ↵ | Diva Canto | 2010-08-03 | 1 | -10/+15 |
| | | | | remote calls. | ||||
* | Bug fix (HG): mantis #4891. This doesn't actually fix the underlying bug, ↵ | Diva Canto | 2010-08-03 | 2 | -56/+63 |
| | | | | | | 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 !!!###!!! | ||||
* | Changed the way HG client verification is done: now transforming local and ↵ | Diva Canto | 2010-07-30 | 1 | -4/+7 |
| | | | | 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. | ||||
* | This combination is working. It all points to not being able to use ↵ | Diva Canto | 2010-05-15 | 1 | -5/+5 |
| | | | | 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. | ||||
* | Almost, but not quite. Commenting verification again, until I understand ↵ | Diva Canto | 2010-05-15 | 1 | -4/+4 |
| | | | | where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets. | ||||
* | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 1 | -12/+15 |
| | |||||
* | * Added missing loggout notification to home grid upon agents logging out in ↵ | Diva Canto | 2010-05-08 | 1 | -0/+4 |
| | | | | | | foreign grids. * Added missing config in StandaloneHypergrid.ini | ||||
* | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 1 | -11/+10 |
| | | | | | | 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. | ||||
* | Assorted bug fixes in hypergrid linking. | Diva Canto | 2010-05-03 | 1 | -1/+2 |
| | |||||
* | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 1 | -1/+28 |
| | |||||
* | List of friends now retrieved upon login. Configured and tested in ↵ | Diva Canto | 2010-02-25 | 1 | -0/+1 |
| | | | | standalone only. | ||||
* | Commenting UserAgentService.VerifyClient(UUID sessionID, string token) for ↵ | Diva Canto | 2010-02-02 | 1 | -11/+16 |
| | | | | now until I understand better the client IP issue. |