Commit Graph

43 Commits

Author SHA1 Message Date
Melanie
46a531d865 Merge branch 'master' into careminster-presence-refactor 2010-06-30 21:35:05 +01: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
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
c5878b6610 Merge branch 'master' into careminster-presence-refactor 2010-06-04 21:11:15 +01:00
John Hurliman
d740035ef4 Applying patch from coyled to fix IAR support with the SimianGrid connectors 2010-06-01 13:32:14 -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
Diva Canto
13c22015e5 Removed sessionID from GridUserservice again. Removed parcel crossing detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface. 2010-05-20 15:14:14 -07:00
unknown
59dec2f989 * Added sessionID to IGridUserService.SetLastPosition(), as some connectors 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
2010-05-20 11:51:57 -07:00
Diva Canto
d72769930a More cleaning on presence. Friends online/offline works again. 2010-05-08 07:44:07 -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
John Hurliman
67990ea7e4 * Better error logging for failed SimianGrid web service calls 2010-04-22 18:55:31 -07:00
John Hurliman
1e87fc8a26 Applying a patch from lkalif to fix a small bug in the previous patch 2010-04-14 11:05:28 -07:00
John Hurliman
6892fc41f7 Applying patch from lkalif to add support for inventory links to the SimianGrid connectors 2010-04-13 18:59:05 -07:00
John Hurliman
3f6c4c150e * Adds IAssetService.GetCached() to allow asset fetching from the local cache only
* Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer
* Sanity check for null reference in LLClientView.RefreshGroupMembership()
2010-04-08 12:31:44 -07:00
John Hurliman
542abb9c43 * Fixing incorrect documentation for the continuation passing style IAssetService.Get() method
* Changing the SimianGrid asset service connector to match the corrected documentation
2010-04-07 09:58:16 -07:00
John Hurliman
f302224caf * In the async asset fetch method, cache check before firing any async code. This should alleviate some "thread storm" issues when regions are starting up that hit Mono especially hard 2010-04-05 14:52:25 -07:00
John Hurliman
4c9cc56624 * Better logging for Authenticate() failures
* Changed a warning message to debug when fetching user sessions
2010-04-02 13:32:30 -07:00
John Hurliman
1430441cf3 Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion 2010-03-26 15:13:55 -07:00
John Hurliman
5a2315c68c * Fixed a bug with null value handling in WebUtil.BuildQueryString()
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
John Hurliman
9a781e793a * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll
* Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
2010-03-20 19:21:58 -07:00
Dan Lake
62e0b53ca4 Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. 2010-03-19 15:16:44 -07:00
John Hurliman
d722519b31 * Fixing the SimianGrid friend connector enabled detection since the friends module uses a different pattern in the .ini file 2010-03-16 10:40:15 -07:00
John Hurliman
cffe39b95f * Fixed a bug in Simian.IsSimianEnabled (since the default module strings follow the form OpenSim.Services.Connectors.dll:SimianGridServiceConnector instead of SimianGridServiceConnector) 2010-03-15 20:52:41 -07:00
John Hurliman
84459d2bc2 Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors 2010-03-15 15:38:29 -07:00
John Hurliman
3ea9fdea8b Minor tweak to clean up SimianGrid asset service URLs 2010-03-12 14:39:51 -08:00
John Hurliman
3036aba875 * Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
John Hurliman
9e3cdc4da5 Fixing the previous patch to work correctly with standalone mode 2010-03-12 13:28:16 -08:00
John Hurliman
0b5141d45b Fixed SimianGrid connectors to gracefully exit if the required config sections are missing 2010-03-12 13:16:44 -08:00
Justin Clark-Casey (justincc)
aad17e7513 Simplify database setup and remove migration problems by moving all sqlite config-include settings to a separate file for standalone
Update information in StandaloneCommon.ini.example to reflect this
Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.).
Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files
Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations
2010-03-12 20:29:17 +00:00
John Hurliman
2040649871 Adding the SimianGrid connectors 2010-03-11 11:19:02 -08:00