| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 1 | -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/opensim | Diva Canto | 2012-03-08 | 1 | -0/+213 | |
| | |\ | ||||||
| | * | | HG inventory/asset transfers: serialize asset posts. I'm using the same ↵ | Diva Canto | 2012-03-08 | 1 | -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 careminster | Melanie | 2012-03-09 | 2 | -2/+216 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -2/+3 | |
| | |\ \ | | |/ | ||||||
| | | * | Fixes mantis #5923 | Diva Canto | 2012-03-08 | 1 | -2/+3 | |
| | | | | ||||||
| | * | | Merge branch 'xassetservice' | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -0/+213 | |
| | |\ \ | | |/ | |/| | ||||||
| | | * | Start by adding XAssetService as a copy of the existing AssetService. | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -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 careminster | Melanie | 2012-03-08 | 3 | -9/+9 | |
| |\ \ \ | |/ / | ||||||
| | * | | Change "help" to display categories/module list then "help ↵ | Justin Clark-Casey (justincc) | 2012-03-08 | 3 | -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 ↵ | Melanie | 2012-03-04 | 1 | -0/+10 | |
| |\ \ \ | | | | | | | | | | | | | careminster | |||||
| | * | | | Add a cache on GridService requests | Melanie | 2012-02-24 | 1 | -0/+10 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-04 | 2 | -2/+42 | |
| |\ \ \ \ | |/ / / |/| / / | |/ / | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||||
| | * | | OpenID auth needs hashing before authenticating | BlueWall | 2012-03-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge branch 'master' into v3_support | BlueWall | 2012-03-02 | 1 | -2/+2 | |
| | |\ \ | | |/ | ||||||
| | | * | Revert "Fix authentication for OpenID provider" | BlueWall | 2012-02-29 | 1 | -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_support | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| | |\ \ | | |/ | ||||||
| | | * | Fix authentication for OpenID provider | BlueWall | 2012-02-29 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Merge branch 'master' into v3_support | BlueWall | 2012-02-22 | 2 | -2/+3 | |
| | |\ \ | | |/ | ||||||
| | * | | V3 Support | BlueWall | 2012-02-22 | 2 | -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: | BlueWall | 2012-02-21 | 2 | -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 careminster | Melanie | 2012-02-23 | 2 | -2/+3 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| | * | | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 2 | -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 careminster | Melanie | 2012-02-20 | 1 | -6/+17 | |
| |\ \ | |/ | ||||||
| | * | Amend to last commit: synchronize access to queues. | Diva Canto | 2012-02-20 | 1 | -2/+5 | |
| | | | ||||||
| | * | More improvements on agent position updates: if the target sims fail, ↵ | Diva Canto | 2012-02-20 | 1 | -6/+14 | |
| | | | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 3 | -3/+9 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||||
| | * | Propagate our teleport flags on logins | BlueWall | 2012-02-18 | 2 | -2/+8 | |
| | | | ||||||
| | * | Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends ↵ | Justin Clark-Casey (justincc) | 2012-02-16 | 1 | -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 sim | Melanie | 2012-02-14 | 1 | -1/+4 | |
| | | | | | | | | | crossings | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 9 | -103/+120 | |
| |\ \ | |/ | ||||||
| | * | Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 9 | -103/+120 | |
| | | | | | | | | | exception in service connectors | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||||
| | * | Supply correct parameters to detailed authentication login fail message | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 1 | -1/+8 | |
| |\ \ | |/ | ||||||
| | * | Next step for world map overlays | Melanie | 2012-01-30 | 1 | -1/+8 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-27 | 1 | -6/+7 | |
| |\ \ | |/ | ||||||
| | * | HG Inventoty: Guard against items not found. | Diva Canto | 2012-01-26 | 1 | -6/+7 | |
| | | | ||||||
| | * | Allow retrival of multiple user records in one operation, analog to presence | Melanie | 2012-01-16 | 4 | -2/+77 | |
| | | | ||||||
| * | | Add methods to allow the groups modules to query online status and last login | Melanie | 2012-01-16 | 4 | -2/+77 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-12 | 2 | -7/+13 | |
| |\ \ | |/ | ||||||
| | * | HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵ | Diva Canto | 2012-01-12 | 2 | -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 careminster | Melanie | 2012-01-07 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-01-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix up asset stuff | Melanie | 2012-01-06 | 1 | -0/+3 | |
| | | | ||||||
| * | | Remove a dangling command registration | Melanie | 2012-01-05 | 1 | -4/+0 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 2 | -160/+3 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||||
| | * | Move simulator asset info commands to an optional module from the connector. ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -43/+2 | |
| | | | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled. | |||||
| | * | Move asset commands from AssetService to AssetServerConnector so that we can ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -121/+3 | |
| | | | | | | | | | | | | | harmonise the same commands on the simulator side. No functional change. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 3 | -0/+80 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |