aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Move simulator asset info commands to an optional module from the connector. ↵Justin Clark-Casey (justincc)2012-01-051-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-051-121/+3
| | | | | | | | | | | | harmonise the same commands on the simulator side. No functional change.
* | Merge branch 'master' into careminsterMelanie2012-01-053-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/opensimBlueWall2012-01-031-0/+6
| |\
| * | Profile UpdatesBlueWall2012-01-033-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 careminsterMelanie2012-01-026-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-021-0/+6
| |/ | | | | | | hunting. No functional changes.
| * Bring back the Hyperlinker to the Robust console. Moved the config to ↵Diva Canto2011-12-301-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 Canto2011-12-301-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 connectorMic Bowman2011-12-291-0/+4
| | | | | | | | This should make bi-directional hypergrid work.
| * Added field LocalToGrid in UserAccount. Context: make HG work in Simian.Diva Canto2011-12-291-0/+8
| |
| * HG: more adjustments for making HG Simian work. Added server_uri as new key ↵Diva Canto2011-12-292-1/+4
| | | | | | | | on get_agent_home in UAS.
* | Merge branch 'master' into careminsterMelanie2011-12-282-4/+44
|\ \ | |/
| * HG: more / love for XmasDiva Canto2011-12-242-4/+44
| |
* | Merge branch 'master' into careminsterMelanie2011-12-243-1/+6
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-231-25/+56
| |\
| * | HG: AAdded a few missing /'s at the end of URLsDiva Canto2011-12-233-1/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-231-25/+56
|\ \ \ | | |/ | |/|
| * | Enables processing of hypergrid links through simiangrid services. ThanksMic Bowman2011-12-221-25/+56
| |/ | | | | | | otakup0pe
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * HG: Verify that the user is localDiva Canto2011-12-211-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2011-12-181-0/+1
|\ \ | |/
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-161-0/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-055-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 Canto2011-12-041-0/+2
| | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now.
| * HG: Renamed one methodDiva Canto2011-12-044-4/+4
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-11-241-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-242-20/+49
|\ \ | |/
| * Append asset ID to URL for storage requests to allow caching proxies to work ↵Dan Lake2011-11-231-1/+3
| | | | | | | | with Simian
| * Improve the error messages returned if the HelloNeighbour call fails.Justin Clark-Casey (justincc)2011-11-211-19/+46
| | | | | | | | This is the message a region sends to its neighbours when it comes up
* | Merge branch 'master' into bigmergeMelanie2011-11-195-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-192-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
generated by cgit v1.1 at 2024-11-09 01:57:41 +0000