aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-061-1/+128
|\ | | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Make "show asset" command available simulator side. Actually make the ↵Justin Clark-Casey (justincc)2012-01-051-5/+5
| | | | | | | | | | | | service command be "show asset" instead of "show digest" this time. Last time I accidnetally just changed the usage message.
| * Add size and temporary information to "show asset" commandJustin Clark-Casey (justincc)2012-01-051-0/+2
| |
| * Rename 'show digest' console command to 'show asset'Justin Clark-Casey (justincc)2012-01-051-1/+1
| |
| * Move asset commands from AssetService to AssetServerConnector so that we can ↵Justin Clark-Casey (justincc)2012-01-051-1/+126
| | | | | | | | | | | | harmonise the same commands on the simulator side. No functional change.
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+33
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Profile UpdatesBlueWall2012-01-031-0/+33
| | | | | | | | 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-021-1/+1
|\ \ | |/ | | | | | | | | | | | | 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
| * Fixed mix-up in UserAccount fields when passing UserAccounts remotely.Diva Canto2011-12-291-1/+1
| |
* | 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-0522-29/+29
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-0522-29/+29
| | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Merge branch 'master' into bigmergeMelanie2011-12-052-2/+34
|\ \ | |/ | | | | | | | | 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-1/+33
| | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now.
| * HG: Renamed one methodDiva Canto2011-12-041-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-194-13/+16
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for ↵Justin Clark-Casey (justincc)2011-11-191-2/+2
| | | | | | | | | | | | | | SendCreateChildAgent" message This is misleading since a simulator will call this method before successfully trying remote regions. Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵Justin Clark-Casey (justincc)2011-11-191-2/+1
| | | | | | | | | | | | | | 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
| * Remove mono compiler warnings. Fix problem with co-ordinate given in ↵Justin Clark-Casey (justincc)2011-11-192-4/+4
| | | | | | | | deregister region message
| * Improve some grid region log messages to express regions at co-ordinate ↵Justin Clark-Casey (justincc)2011-11-191-5/+9
| | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000)
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-252-3/+73
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-242-3/+73
| | | | | | | | | | These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default) These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
* | Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmergeMelanie2011-10-252-23/+46
|\ \ | |/
| * Add option to allow remote http calls to setpassword in the ↵Justin Clark-Casey (justincc)2011-10-192-23/+46
| | | | | | | | | | | | | | AuthenticationService. This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini Default is false as before.
* | Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmergeMelanie2011-10-251-11/+6
|\ \ | |/
| * Make ScopeID optional for http GetAccount and GetAccountsJustin Clark-Casey (justincc)2011-10-191-11/+6
| | | | | | | | If not specified then it assumes UUID.Zero. as occurs elsewhere in the codebase
* | Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmergeMelanie2011-10-251-0/+6
|\ \ | |/
| * Make PrincipalID a synonym for UserID in GetUserAccountJustin Clark-Casey (justincc)2011-10-191-0/+6
| |
* | Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmergeMelanie2011-10-251-3/+3
|\ \ | |/
| * Get new NewUser and SetUserAccount calls to accept PrincipalID instead of ↵Justin Clark-Casey (justincc)2011-10-191-3/+3
| | | | | | | | UserID for consistency with output
* | Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmergeMelanie2011-10-251-3/+59
|\ \ | |/
| * Allow an http call to set account details if AllowSetAccount = true in ↵Justin Clark-Casey (justincc)2011-10-191-3/+59
| | | | | | | | | | | | [UserAccountService]. As before, default is false to not allow these calls.
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-252-4/+62
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the ↵Justin Clark-Casey (justincc)2011-10-182-4/+62
| | | | | | | | | | | | | | | | | | UserAccountService Default is false, as before. Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces. Only Ruths can be created at present. Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
* | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-251-13/+5
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-121-13/+5
| |
* | Resolve merge commits, stage 1Tom2011-09-041-1/+1
|\ \ | |/
| * Pass the first name and last name from the agent circuit data to the ↵Justin Clark-Casey (justincc)2011-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | authorization service rather than from the account. This is to accomodate situations where the authorization service is being used by the hypergrid, where visitors have no user account. See http://opensimulator.org/mantis/view.php?id=5517, this code is somewhat adapted/cleaned up from Michelle's patch I'm a little ambivalent about this since visitors could put anything in firstname/lastname so it's not much of an auth measure. It's up to the auth service to decide which data it actually uses. Possibly we should be passing through other info such as agent circuit ip
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-202-2/+123
|\ \ | |/
| * V2 map now working in grids too. WARNING: A few visible configuration ↵Diva Canto2011-06-132-2/+123
| | | | | | | | variables added in order for this to work. See .ini.example changes
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-132-0/+167
|\ \ | |/
| * bit depth: 24!!! begeez! -- zoom levels work now.Diva Canto2011-06-121-1/+3
| |
| * A few bug fixes on map V2. Zoom level weirdness still there.Diva Canto2011-06-121-3/+2
| |
| * First pass at making the V2 map work. Standalones only for now. There are ↵Diva Canto2011-06-122-0/+166
| | | | | | | | some issues with the zoom level -- TBD.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-096-9/+915
|\ \ | |/
| * This hopefully fixes all issues with online/offline notifications across ↵Diva Canto2011-06-071-3/+13
| | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528
| * This fixes the crash reported in ↵Diva Canto2011-06-071-12/+12
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully.
| * HG IM bug fix: grid_instant_message was being placed in the default port ↵Diva Canto2011-06-021-2/+1
| | | | | | | | instead of the specified one.
| * Extra debug messageDiva Canto2011-06-021-0/+1
| |