| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | 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 | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-03 | 1 | -0/+6 | |
| | |\ | ||||||
| | * | | Profile Updates | BlueWall | 2012-01-03 | 3 | -0/+80 | |
| | | | | | | | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 6 | -31/+39 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs | |||||
| | * | | Adding commented out log messages and some minor formatting for future bug ↵ | Justin Clark-Casey (justincc) | 2012-01-02 | 1 | -0/+6 | |
| | |/ | | | | | | | hunting. No functional changes. | |||||
| | * | Bring back the Hyperlinker to the Robust console. Moved the config to ↵ | Diva Canto | 2011-12-30 | 1 | -30/+25 | |
| | | | | | | | | | [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis. | |||||
| | * | Default LocalToGrid to true. Fixes minor bug introduced yesterday where old ↵ | Diva Canto | 2011-12-30 | 1 | -5/+1 | |
| | | | | | | | | | robust UserAccount service would result is LocalToGrid at the sim being false. | |||||
| | * | Set the local grid flag in the user account through the simian connector | Mic Bowman | 2011-12-29 | 1 | -0/+4 | |
| | | | | | | | | | This should make bi-directional hypergrid work. | |||||
| | * | Added field LocalToGrid in UserAccount. Context: make HG work in Simian. | Diva Canto | 2011-12-29 | 1 | -0/+8 | |
| | | | ||||||
| | * | HG: more adjustments for making HG Simian work. Added server_uri as new key ↵ | Diva Canto | 2011-12-29 | 2 | -1/+4 | |
| | | | | | | | | | on get_agent_home in UAS. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-28 | 2 | -4/+44 | |
| |\ \ | |/ | ||||||
| | * | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 2 | -4/+44 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-24 | 3 | -1/+6 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-23 | 1 | -25/+56 | |
| | |\ | ||||||
| | * | | HG: AAdded a few missing /'s at the end of URLs | Diva Canto | 2011-12-23 | 3 | -1/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-23 | 1 | -25/+56 | |
| |\ \ \ | | |/ | |/| | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |