Melanie
0b74662ce2
Merge branch 'master' into careminster-presence-refactor
2010-07-14 19:53:15 +01:00
Justin Clark-Casey (justincc)
71433075a9
Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars
2010-07-14 17:12:12 +01:00
Melanie
5f400a50be
Merge branch 'master' into careminster-presence-refactor
2010-07-08 17:32:57 +01:00
Diva Canto
7525f3a556
Don't include hyperlinks as neighbors, even if grid operators have done the mistake of placing them as neighbors. This will not prevent further mess ups coming from that unsupported action.
2010-07-05 04:19:53 -07:00
Tom Grimshaw
14ab22dcd4
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-04 06:51:01 -07:00
Tom Grimshaw
3368e3853a
Check cached asset to make sure it contains data, and if not, re-request
2010-07-04 06:45:04 -07:00
Melanie
8a45191aa9
Merge branch 'master' into careminster-presence-refactor
2010-07-04 11:02:21 +01:00
Tom Grimshaw
2b49cb9227
Make sure the AssetServiceConnector times out within 30 seconds. If it doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue.
2010-07-03 06:09:20 -07:00
Diva Canto
028303c3e1
Fixes mantis #4835
2010-07-03 02:44:28 -07:00
Melanie
e328c23355
Add MapTileURL to robust to supply the url needed by snowglobe
2010-07-02 04:03:35 +01:00
Tom Grimshaw
071d601dcb
Cache all assets on upload so that the client can still retrieve the asset if it enters a retry queue
2010-07-01 09:46:57 -07:00
Tom Grimshaw
b38a22506b
Fix build break
2010-07-01 08:57:13 -07:00
Tom Grimshaw
38384cc79c
Report asset upload success if it has previously failed
2010-07-01 08:52:30 -07:00
Tom Grimshaw
4851706d35
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-01 08:49:53 -07:00
Tom Grimshaw
1cb7695fb0
Catch newid == null which is what happens if the asset service is offline (seems a connection failure does not throw an exception)
2010-07-01 08:48:02 -07:00
Melanie
46a531d865
Merge branch 'master' into careminster-presence-refactor
2010-06-30 21:35:05 +01:00
Tom Grimshaw
8dc7c0849e
The other half of the asset fix. Implement an exponentially incrementing 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.
2010-06-29 23:18:48 -07:00
Diva Canto
08e3389790
Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase".
2010-06-29 04:38:15 -07:00
Diva Canto
20fc35399b
Fixes mantis #4815 and #4812
2010-06-28 14:10:22 -07:00
Tom Grimshaw
06fa038875
Return a UUID.Zero if the asset fails to upload
2010-06-28 07:09:05 -07:00
Melanie
1499fd85c4
Fix a simian compiler warning
2010-06-27 21:02:03 +01:00
Melanie
dc9e9931eb
Merge branch 'master' into careminster-presence-refactor
2010-06-25 20:26:48 +01:00
John Hurliman
6848465ae2
* SimianAssetServiceConnector Delete() was expecting the wrong type of response, reporting false errors
...
* Fixed a typo in a WebUtil error message
2010-06-24 13:43:38 -07:00
John Hurliman
1e1485de5b
* Fixed SimianGrid map tile uploads not having any objects in the images
2010-06-22 16:09:30 -07:00
Melanie
317ac50a97
Merge branch 'master' into careminster-presence-refactor
2010-06-22 23:38:56 +01:00
Melanie
0b75f759b4
Merge branch 'master' into careminster-presence-refactor
2010-06-16 04:10:55 +01:00
John Hurliman
6c0a372346
* Support salted and unsalted password hashes in SimianAuthenticationServiceConnector
2010-06-15 17:46:36 -07:00
Diva Canto
38f098588c
Fixes creation date issue on user accounts.
2010-06-15 16:36:22 -07:00
Diva Canto
19558f380a
Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.
2010-06-13 19:06:22 -07:00
Melanie
fdf648bcf3
Merge branch 'master' into careminster-presence-refactor
2010-06-14 02:49:15 +01:00
Melanie
14c587bea1
Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following
...
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.
2010-06-13 21:45:39 +01:00
Melanie
6a2e0c707c
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:34:26 +01:00
Melanie
ed38b4a140
Some people don't use Simian. Make the connector respect that it's disabled
...
and not try to send a map tile in that case.
2010-06-12 00:32:54 +01:00
Melanie
836728e5de
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:08:20 +01:00
John Hurliman
b5bc2816fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 15:43:22 -07:00
John Hurliman
d1a324888b
* Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed
...
* Aesthetically improved map tile water
* SimianGrid connector now uploads a PNG tile to the AddMapTile API
2010-06-11 15:37:25 -07:00
Justin Clark-Casey (justincc)
3525195bc9
Allow IInventoryService.GetFolder(folderId, userId) as well as 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
2010-06-11 21:55:18 +01:00
Melanie
6b2d2413f7
Merge branch 'master' into careminster-presence-refactor
2010-06-09 16:48:37 +01:00
Diva Canto
5c0068723f
Changed XInventoryData's CreatorID to a string.
2010-06-08 15:52:26 -07:00
Melanie
74d62901c8
Merge branch 'master' into careminster-presence-refactor
2010-06-07 00:44:36 +01:00
Diva Canto
ab3afd5f42
* Bug fix in TP home: typo in unpacking of GridUserInfo.
...
* Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions.
2010-06-05 09:39:09 -07:00
Melanie
c5878b6610
Merge branch 'master' into careminster-presence-refactor
2010-06-04 21:11:15 +01:00
Justin Clark-Casey (justincc)
f319d2ef5e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-04 20:44:01 +01:00
Justin Clark-Casey (justincc)
75878c8f43
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
...
additional tweaks to get this working properly
2010-06-04 20:43:05 +01:00
Diva Canto
952029380a
Fixed a couple of buglets in Friendship offers / acceptance / decline when avies are in different sims.
2010-06-04 10:59:59 -07:00
John Hurliman
d740035ef4
Applying patch from coyled to fix IAR support with the SimianGrid connectors
2010-06-01 13:32:14 -07:00
Melanie Thielker
84e30bee6d
Revert "Meta7 Communities : Authorization service added, skeleton, not yet functional"
...
This reverts commit 31439293cc
2010-05-29 12:34:02 +02:00
Tom Grimshaw
31439293cc
Meta7 Communities : Authorization service added, skeleton, not yet functional
2010-05-29 03:56:34 -07:00
Tom Grimshaw
3a5d379db8
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-29 01:07:19 -07:00
Tom Grimshaw
2f409116db
Stop IGridService from throwing a fatal exception when an IPEndPoint cannot 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.
2010-05-29 01:03:59 -07:00
