aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-041-1/+1
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer sizeMic Bowman2011-11-021-1/+1
| | | | | | | | | | not a target size. Mono 2.10 appears to try to allocate the full buffer which immediately crashes. Tested on mono 2.6.7 and 2.10.5
* | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ | |/
| * Revert "fix CopyTo call that was breaking under mono 2.10"Melanie2011-11-031-1/+1
| | | | | | | | This reverts commit d30971fdc243886b8fc614c7f869530db87e10f2.
* | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ | |/
| * fix CopyTo call that was breaking under mono 2.10Mic Bowman2011-11-021-1/+1
| |
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-254-1/+93
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-244-1/+94
| | | | | | | | | | 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 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-251-3/+11
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the ↵Justin Clark-Casey (justincc)2011-10-181-3/+11
| | | | | | | | | | | | | | | | | | 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 '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmergeMelanie2011-10-251-1/+0
|\ \ | |/
| * Bug fix on the bug fix on UserAccountService.csDiva Canto2011-10-161-1/+0
| |
* | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Guard HGAssetService against uninitialized variables and null arguments.Diva Canto2011-10-151-0/+3
| |
* | Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmergeMelanie2011-10-251-46/+44
|\ \ | |/
| * Bug fix -- Test User on first run standalone might not be created properly: ↵Diva Canto2011-10-131-46/+44
| | | | | | | | let all instances of UserAccountService have all its service references properly initialized, and register console commands on only one.
* | Merge branch 'master' into bigmergeMelanie2011-10-121-0/+7
|\ \ | |/
| * Make it possible to disable the HG linker. On non-HG systems it spits yellowMelanie2011-10-121-0/+7
| | | | | | | | spam, so it should not load unless HG is desired.
* | Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmergeMelanie2011-10-121-2/+4
|\ \ | |/
| * Tweak to language of last commit in rejecting UUID.Zero in ↵Justin Clark-Casey (justincc)2011-10-081-2/+4
| | | | | | | | | | | | | | GridService.RegisterRegion() Allowing regions with UUID.Zero causes problems elsewhere according to http://opensimulator.org/mantis/view.php?id=3426 It's probably a bad idea to allow these in any case.
* | Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmergeMelanie2011-10-121-0/+2
|\ \ | |/
| * GridService - Region UUID can not be NULLPixel Tomsen2011-10-081-0/+2
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3426
* | Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmergeMelanie2011-10-121-0/+17
|\ \ | |/
| * Add note to docsBlueWall2011-10-071-0/+17
| | | | | | | | | | This method is used by externasl/3rd party management tools to create users and they depend on us to generate the UUID.
* | Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmergeMelanie2011-10-121-0/+11
|\ \ | |/
| * Added back UserAccount that creates random UUID for new account.BlueWall2011-10-051-0/+11
| | | | | | | | | | This should fix recent issues with 3rd party apps that use the old interface w/o breaking the new one.
* | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-122-6/+17
|\ \ | |/
| * When creating a new user on the comand line, give the option of allowing a ↵Justin Clark-Casey (justincc)2011-10-042-6/+17
| | | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership.
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-123-15/+165
|\ \
| * \ Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-111-5/+9
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
| | * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-231-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
| * | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-111-1/+6
| |\ \ | | |/
| | * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-161-1/+6
| | | | | | | | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
| * | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-111-2/+3
| |\ \ | | |/
| | * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-161-2/+3
| | |
| * | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-1/+3
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
| | * Correctly create a freshly created estate owner's default items and avatar ↵Justin Clark-Casey (justincc)2011-09-161-1/+3
| | | | | | | | | | | | entries on standalone if applicable.
| * | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-111-7/+145
| |\ \ | | |/
| | * Write code to create minimum necessary body parts/clothing and avatar ↵Justin Clark-Casey (justincc)2011-09-151-7/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entries to make a newly created user appear as a non-cloud on viewer 2 Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries. Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim. Default is currently off. My intention is to switch it on for standalone shortly. This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities. Need to fix creation of suitable entries for users created as estate owners on standalone. Avatars still appear with spooky empty eyes, need to see if we can address this. This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461) which can be used.
* | | Merge branch 'careminster-presence-refactor' into bigmergeMelanie2011-10-061-8/+61
|\ \ \ | |/ / |/| |
| * | Change the asset connector to allow connection to different asset serversMelanie2011-10-061-7/+61
| | | | | | | | | | | | depending on the first two digits of the asset id.
* | | Bring us up to date.Tom2011-09-142-15/+13
|\ \ \ | | |/ | |/|
| * | Increase information in logging for UserAgentServiceConnector.Justin Clark-Casey (justincc)2011-09-081-12/+12
| | | | | | | | | | | | Done for http://opensimulator.org/mantis/view.php?id=5669
| * | In SetAttachment, if the existing attachment has no asset id then carry on ↵Justin Clark-Casey (justincc)2011-09-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than abort. When a user logs in, the attachment item ids are pulled from persistence in the Avatars table. However, the asset ids are not saved. When the avatar enters a simulator the attachments are set again. If we simply perform an item check then the asset ids (which are now present) are never set, and NPC attachments later fail unless the attachment is detached and reattached. Hopefully resolves part of http://opensimulator.org/mantis/view.php?id=5653
* | | Resolve merge commits, stage 1Tom2011-09-0419-103/+230
|\ \ \ | |/ / | | / | |/ |/|
| * minor: comment out friends number logging from login for nowJustin Clark-Casey (justincc)2011-08-301-1/+1
| |
| * Fix bug in persisting saved appearances for npcsJustin Clark-Casey (justincc)2011-08-301-2/+7
| | | | | | | | | | Assets have to be marked non-local as well as non-temporary to persist. This is now done. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-221-3/+1
| |
| * Don't need to try both AssetService.Get and GetCached in GetMesh since Get ↵Justin Clark-Casey (justincc)2011-08-181-2/+6
| | | | | | | | always calls GetCached and code paths were identical
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-171-1/+1
| |