aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
* | Merge branch 'master' into careminsterMelanie2012-03-091-3/+7
|\ \ | |/
| * More on inventory transfer hold ups:Diva Canto2012-03-091-3/+7
| | | | | | | | | | | | - Added an inventory cache for caching root and system folders - Synchronized the remote inventory connector, so that all the remote inventory calls are serialized This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
* | Merge branch 'master' into careminsterMelanie2012-03-091-1/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-081-0/+213
| |\
| * | HG inventory/asset transfers: serialize asset posts. I'm using the same ↵Diva Canto2012-03-081-1/+20
| | | | | | | | | | | | pattern as suggested in the patch mantis #5921. Testing it in this smaller context to see how it works.
* | | Merge branch 'master' into careminsterMelanie2012-03-092-2/+216
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-091-2/+3
| |\ \ | | |/
| | * Fixes mantis #5923Diva Canto2012-03-081-2/+3
| | |
| * | Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-091-0/+213
| |\ \ | | |/ | |/|
| | * Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-021-0/+213
| | | | | | | | | | | | | | | | | | | | | | | | This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets. Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default. Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429 More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service Feedback and discussion welcome as commits are made.
* | | Merge branch 'master' into careminsterMelanie2012-03-083-9/+9
|\ \ \ | |/ /
| * | Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-083-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-041-0/+10
|\ \ \ | | | | | | | | | | | | careminster
| * | | Add a cache on GridService requestsMelanie2012-02-241-0/+10
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-042-2/+42
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * | OpenID auth needs hashing before authenticatingBlueWall2012-03-021-1/+1
| | |
| * | Merge branch 'master' into v3_supportBlueWall2012-03-021-2/+2
| |\ \ | | |/
| | * Revert "Fix authentication for OpenID provider"BlueWall2012-02-291-2/+2
| | | | | | | | | | | | This reverts commit 9f597c2d423a80279c4aed042be8a991eedefa21. Fixing OpenID causes issues with other parts of the code.
| * | Merge branch 'master' of /home/opensim/src/opensim into v3_supportBlueWall2012-02-291-2/+2
| |\ \ | | |/
| | * Fix authentication for OpenID providerBlueWall2012-02-291-2/+2
| | |
| * | Merge branch 'master' into v3_supportBlueWall2012-02-222-2/+3
| |\ \ | | |/
| * | V3 SupportBlueWall2012-02-222-2/+22
| | | | | | | | | | | | The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
| * | V3 Support:BlueWall2012-02-212-2/+22
| | | | | | | | | | | | This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on.
* | | Merge branch 'master' into careminsterMelanie2012-02-232-2/+3
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-232-2/+3
| |/ | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | Merge branch 'master' into careminsterMelanie2012-02-201-6/+17
|\ \ | |/
| * Amend to last commit: synchronize access to queues.Diva Canto2012-02-201-2/+5
| |
| * More improvements on agent position updates: if the target sims fail, ↵Diva Canto2012-02-201-6/+14
| | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail.
* | Merge branch 'master' into careminsterMelanie2012-02-183-3/+9
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Propagate our teleport flags on loginsBlueWall2012-02-182-2/+8
| |
| * Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends ↵Justin Clark-Casey (justincc)2012-02-161-1/+1
| | | | | | | | grid call would try and contact the wrong uri. Also fixes the build from df960d5
* | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-141-1/+4
| | | | | | | | crossings
* | Merge branch 'master' into careminsterMelanie2012-02-079-103/+120
|\ \ | |/
| * Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ↵Justin Clark-Casey (justincc)2012-02-079-103/+120
| | | | | | | | exception in service connectors
* | Merge branch 'master' into careminsterMelanie2012-02-041-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Supply correct parameters to detailed authentication login fail messageJustin Clark-Casey (justincc)2012-02-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-301-1/+8
|\ \ | |/
| * Next step for world map overlaysMelanie2012-01-301-1/+8
| |
* | Merge branch 'master' into careminsterMelanie2012-01-271-6/+7
|\ \ | |/
| * HG Inventoty: Guard against items not found.Diva Canto2012-01-261-6/+7
| |
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-164-2/+77
| |
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-164-2/+77
| |
* | Merge branch 'master' into careminsterMelanie2012-01-122-7/+13
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-122-7/+13
| | | | | | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
* | Merge branch 'master' into careminsterMelanie2012-01-071-1/+1
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-01-071-1/+1
| |
* | Fix up asset stuffMelanie2012-01-061-0/+3
| |
* | Remove a dangling command registrationMelanie2012-01-051-4/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-062-160/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
generated by cgit v1.1 at 2024-12-27 15:37:56 +0000