Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-04 | 2 | -3/+22 | |
| |\ \ | | |/ | ||||||
| | * | Fixes mantis #4835 | Diva Canto | 2010-07-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | Add MapTileURL to robust to supply the url needed by snowglobe | Melanie | 2010-07-02 | 2 | -2/+21 | |
| | | | ||||||
* | | | Check cached asset to make sure it contains data, and if not, re-request | Tom Grimshaw | 2010-07-04 | 1 | -3/+3 | |
|/ / | ||||||
* | | Make sure the AssetServiceConnector times out within 30 seconds. If it ↵ | Tom Grimshaw | 2010-07-03 | 1 | -2/+2 | |
| | | | | | | | | doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue. | |||||
* | | Cache all assets on upload so that the client can still retrieve the asset ↵ | Tom Grimshaw | 2010-07-01 | 1 | -3/+2 | |
| | | | | | | | | if it enters a retry queue | |||||
* | | Fix build break | Tom Grimshaw | 2010-07-01 | 1 | -1/+1 | |
| | | ||||||
* | | Report asset upload success if it has previously failed | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 | |
| | | ||||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-07-01 | 4 | -5/+16 | |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 4 | -5/+16 | |
| |\ \ | | |/ | ||||||
| | * | Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG ↵ | Diva Canto | 2010-06-29 | 2 | -3/+10 | |
| | | | | | | | | | | | | xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase". | |||||
| | * | Fixes mantis #4815 and #4812 | Diva Canto | 2010-06-28 | 1 | -1/+5 | |
| | | | ||||||
| | * | Fix a simian compiler warning | Melanie | 2010-06-27 | 1 | -1/+1 | |
| | | | ||||||
* | | | Catch newid == null which is what happens if the asset service is offline ↵ | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 | |
|/ / | | | | | | | (seems a connection failure does not throw an exception) | |||||
* | | The other half of the asset fix. Implement an exponentially incrementing ↵ | Tom Grimshaw | 2010-06-29 | 1 | -11/+88 | |
| | | | | | | | | retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets. | |||||
* | | Return a UUID.Zero if the asset fails to upload | Tom Grimshaw | 2010-06-28 | 1 | -1/+4 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-25 | 1 | -7/+22 | |
|\ \ | |/ | ||||||
| * | * SimianAssetServiceConnector Delete() was expecting the wrong type of ↵ | John Hurliman | 2010-06-24 | 1 | -7/+22 | |
| | | | | | | | | | | | | response, reporting false errors * Fixed a typo in a WebUtil error message | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-22 | 2 | -4/+30 | |
|\ \ | |/ | ||||||
| * | * Fixed SimianGrid map tile uploads not having any objects in the images | John Hurliman | 2010-06-22 | 2 | -4/+30 | |
| | | ||||||
* | | 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 | |
| | | |