| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Enables processing of hypergrid links through simiangrid services. Thanks | Mic Bowman | 2011-12-22 | 1 | -25/+56 |
| | |/ | | | | | | | otakup0pe | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -0/+8 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | HG: Verify that the user is local | Diva Canto | 2011-12-21 | 1 | -0/+8 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | HG minor bug fix and marked one method obsolete in UAS. | Diva Canto | 2011-12-16 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 5 | -4/+6 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | HG: Added HEAD method to Helo service. This is the preferred method, but its ↵ | Diva Canto | 2011-12-04 | 1 | -0/+2 |
| | | | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now. | ||||
| | * | HG: Renamed one method | Diva Canto | 2011-12-04 | 4 | -4/+4 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 2 | -20/+49 |
| |\ \ | |/ | |||||
| | * | Append asset ID to URL for storage requests to allow caching proxies to work ↵ | Dan Lake | 2011-11-23 | 1 | -1/+3 |
| | | | | | | | | | with Simian | ||||
| | * | Improve the error messages returned if the HelloNeighbour call fails. | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -19/+46 |
| | | | | | | | | | This is the message a region sends to its neighbours when it comes up | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 5 | -10/+31 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly | ||||
| | * | Improve some grid region log messages to express regions at co-ordinate ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 3 | -8/+21 |
| | | | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000) | ||||
| | * | improve region deregistration log message | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+4 |
| | | | |||||
| | * | Don't register a region twice on both official registration and maptile ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 3 | -1/+6 |
| | | | | | | | | | | | | | regeneration. Maptile storage appears orthogonal to region registration | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 3 | -28/+27 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |