Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-16 | 2 | -8/+49 |
|\ | |||||
| * | * Support salted and unsalted password hashes in ↵ | John Hurliman | 2010-06-15 | 1 | -7/+46 |
| | | | | | | | | SimianAuthenticationServiceConnector | ||||
| * | Fixes creation date issue on user accounts. | Diva Canto | 2010-06-15 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-14 | 5 | -19/+23 |
|\ \ | |/ | |||||
| * | Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵ | Diva Canto | 2010-06-13 | 3 | -9/+7 |
| | | | | | | | | neighbours. | ||||
| * | Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following | Melanie | 2010-06-13 | 2 | -10/+16 |
| | | | | | | | | | | | | | | changes: - Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it - Adjusted comments to remove misleading or no longer true comments. Default is neuter, according to the code, not male, as the comment stated. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Some people don't use Simian. Make the connector respect that it's disabled | Melanie | 2010-06-12 | 1 | -1/+1 |
| | | | | | | | | and not try to send a map tile in that case. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -3/+81 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-06-11 | 6 | -40/+7 |
| |\ | |||||
| * | | * Added a new method to IMapImageGenerator for getting the map tile before ↵ | John Hurliman | 2010-06-11 | 1 | -3/+81 |
| | | | | | | | | | | | | | | | | | | | | | it is JPEG2000 compressed * Aesthetically improved map tile water * SimianGrid connector now uploads a PNG tile to the AddMapTile API | ||||
| * | | Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 6 | -7/+40 |
| |/ | | | | | | | | | | | | | GetFolder(InventoryFolderBase folder) This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood. This is in line with other methods that alraedy allow requests via uuid | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-09 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Changed XInventoryData's CreatorID to a string. | Diva Canto | 2010-06-08 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-07 | 2 | -3/+1 |
|\ \ | |/ | |||||
| * | * Bug fix in TP home: typo in unpacking of GridUserInfo. | Diva Canto | 2010-06-05 | 2 | -3/+1 |
| | | | | | | | | * Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-04 | 8 | -6/+23 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-06-04 | 4 | -3/+12 |
| |\ | |||||
| | * | Fixed a couple of buglets in Friendship offers / acceptance / decline when ↵ | Diva Canto | 2010-06-04 | 4 | -3/+12 |
| | | | | | | | | | | | | avies are in different sims. | ||||
| * | | get TestSaveIarV0_1() working again by setting up an ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 3 | -2/+10 |
| |/ | | | | | | | | | | | OpenSim.Data.Null.UserAuthenticationData plugin additional tweaks to get this working properly | ||||
| * | Applying patch from coyled to fix IAR support with the SimianGrid connectors | John Hurliman | 2010-06-01 | 1 | -1/+1 |
| | | |||||
| * | Get the user's DOB back from the server response properly. | Melanie Thielker | 2010-05-29 | 1 | -1/+1 |
| | | |||||
* | | Revert "Meta7 Communities : Authorization service added, skeleton, not yet ↵ | Melanie Thielker | 2010-05-29 | 1 | -59/+0 |
| | | | | | | | | | | | | functional" This reverts commit 31439293ccdb5df914dc13287a8f178529fccb6b. | ||||
* | | Meta7 Communities : Authorization service added, skeleton, not yet functional | Tom Grimshaw | 2010-05-29 | 1 | -0/+59 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-05-29 | 3 | -42/+52 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Get the user's DOB back from the server response properly. | Melanie Thielker | 2010-05-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-28 | 2 | -41/+51 |
| |\ \ | | |/ | |||||
| | * | minor: move a method so that the #regions make more sense | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -36/+35 |
| | | | |||||
| | * | fission UserAccountService.HandleCreateUser() into two methods, one which ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -4/+14 |
| | | | | | | | | | | | | handles user command parsing and another which actually does the work | ||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -1/+2 |
| | | | |||||
* | | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵ | Tom Grimshaw | 2010-05-29 | 7 | -8/+33 |
|/ / | | | | | | | be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 3 | -122/+184 |
|\ \ | |/ | |||||
| * | Removed sessionID from GridUserservice again. Removed parcel crossing ↵ | Diva Canto | 2010-05-20 | 5 | -6/+12 |
| | | | | | | | | detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface. | ||||
| * | Merging slimupdates2 | unknown | 2010-05-20 | 5 | -125/+181 |
| |\ | |||||
| | * | * Added sessionID to IGridUserService.SetLastPosition(), as some connectors ↵ | unknown | 2010-05-20 | 5 | -125/+181 |
| | | | | | | | | | | | | | | | | | | will want to track position against sessionID instead of userID * Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-18 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Change an exception reporting to include the stack trace. "e.Message" just | Melanie | 2010-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | _won't_ do. Might look more elegant, but it's too little information. | ||||
* | | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 2 | -1/+21 |
| | | | | | | | | | | | | teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 3 | -3/+25 |
|\ \ \ | |/ / | |||||
| * | | Fixes mantis #4691 for real. This time I tested it, and it works. | Diva Canto | 2010-05-16 | 2 | -1/+18 |
| | | | |||||
| * | | Fixes mantis #4691 | Diva Canto | 2010-05-16 | 3 | -3/+8 |
| | | | |||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-05-16 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Add some debug output to GetAgent to try and track down our presence problems | Tom Grimshaw | 2010-05-13 | 1 | -0/+8 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 4 | -27/+44 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | * Fixed configs in StandaloneHypergrid.ini, it still had the SQLite ↵ | Diva Canto | 2010-05-16 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | connection strings. * Added a comment in LLLoginService.cs, for future reference | ||||
| * | | This combination is working. It all points to not being able to use ↵ | Diva Canto | 2010-05-15 | 2 | -5/+6 |
| | | | | | | | | | | | | 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 | 4 | -18/+32 |
| |/ | |||||
| * | Made fields consistently protected. | Diva Canto | 2010-05-13 | 1 | -8/+8 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-10 | 1 | -1/+1 |
|\ \ | |/ |