aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| |
| * In the asset service, check that an asset exists before attempting to store it.Justin Clark-Casey (justincc)2011-08-171-4/+6
| |
| * Added optional Login Service parameter "Currency" to be able to change the ↵Snoopy Pfeffer2011-08-142-2/+21
| | | | | | | | currency name shown in the viewer.
| * comment out some of the currently less useful debug log messagesJustin Clark-Casey (justincc)2011-08-111-1/+1
| |
| * Do proper locking of m_localScenes list in SceneManagerJustin Clark-Casey (justincc)2011-08-061-4/+3
| |
| * Get "show region" command in GridService to show grid co-ordinates rather ↵Justin Clark-Casey (justincc)2011-08-051-2/+3
| | | | | | | | | | | | | | than meters co-ord. This makes it consistent with "show regions" Addresses http://opensimulator.org/mantis/view.php?id=5619
| * If GetRegionByName can't match something in the local db, then search the ↵Justin Clark-Casey (justincc)2011-08-021-6/+27
| | | | | | | | | | | | hypergrid if that functionality has been enabled. This should fix the problem today where old style HG addresses (e.g. "hg.osgrid.org:80:Vue-6400") stopped working since 8c3eb324c4b666e7abadef4a714d1bd8d5f71ac2
| * Change GridService.GetRegionByName() to only return info if there is an ↵Justin Clark-Casey (justincc)2011-08-022-1/+7
| | | | | | | | | | | | | | exact region name match, unlike GetRegionsByName() This should fix the first part of http://opensimulator.org/mantis/view.php?id=5606, and maybe 5605. Thanks to Melanie for helping with this.
| * Revert "In GridService, have GetRegionByName() call GetRegionsByName() with ↵Justin Clark-Casey (justincc)2011-08-021-5/+4
| | | | | | | | | | | | | | | | a max return of 1 instead of duplicating code." This reverts commit 8d33a2eaa10ed75146f45cca4d6c19ac814d5fee. Better fix will be along in a minute
| * In GridService, have GetRegionByName() call GetRegionsByName() with a max ↵Justin Clark-Casey (justincc)2011-08-021-4/+5
| | | | | | | | | | | | return of 1 instead of duplicating code. This also fixes the problem where this method would not return a hypergrid region, unlike GetRegionsByName()
| * Get rid of AvatarAppearance.Owner to simplify the code.Justin Clark-Casey (justincc)2011-08-025-7/+7
| | | | | | | | This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
| * Temporary code to change bad AvatarHeight values in the AvatarService to the ↵Justin Clark-Casey (justincc)2011-07-301-1/+27
| | | | | | | | | | | | | | default Ruth height. I was persuaded to do this because simulators on osgrid will persist in inserting bad values for an unknown length of time, even after the original simulator bug which was inserting bad values is out in an osgrid distro This code can be removed at some point in the future, though I think there is an argument for having services police these values in open grids.
| * Pass the first name and last name from the agent circuit data to the ↵Justin Clark-Casey (justincc)2011-07-232-16/+21
| | | | | | | | | | | | | | | | | | | | 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
| * For default everyone permissions on library items, make notecards and ↵Justin Clark-Casey (justincc)2011-07-231-1/+2
| | | | | | | | | | | | | | | | | | | | scripts non-modifiable (but still copyable, etc). Users should not be given the impression that they can modify these items. This still does not solve the issue where library items cannot be dragged into prims or user inventory any time after they are initially seen. Curiously, manually copying and pasting still appears to work. On the surface, this seems to have something to do with library item caching on the client, since deleting the cache allows drag to work again once Not sure what the exact problem is.
| * Remove manually permissions settings on all current library items so that ↵Justin Clark-Casey (justincc)2011-07-231-4/+4
| | | | | | | | | | | | | | they use the defaults instead. Some items had completely wrong permissions - this is easier than correcting them all. The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts)
| * Revert "Don't load current/next/everyone/base permissions from the library ↵Justin Clark-Casey (justincc)2011-07-231-11/+26
| | | | | | | | | | | | | | | | item xml files - always use PermissionMask.All instead (which was the existing default)." There actually are uses for this. I will correct the perms instead since some entries appear to be wrong. This reverts commit 667b54f5a2a04fa5a2859397868d270eab3913f1.
| * Don't load current/next/everyone/base permissions from the library item xml ↵Justin Clark-Casey (justincc)2011-07-231-26/+11
| | | | | | | | | | | | files - always use PermissionMask.All instead (which was the existing default). Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes.
| * When an uncached asset is requested multiple times concurrently, only load ↵Oren Hurvitz2011-07-211-9/+49
| | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com>
| * add test for resizing one part in a groupJustin Clark-Casey (justincc)2011-07-161-1/+0
| |
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-07-161-35/+36
| |
| * refactor: Move all callers of the obsoleted ↵Justin Clark-Casey (justincc)2011-07-131-5/+3
| | | | | | | | SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest()
* | Fix failure to find avatars due to trainling spaces being sent by viewers.Melanie2011-07-231-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-091-3/+12
|\ \ | |/
| * When loading library asset set, only store an asset if it's different from ↵Justin Clark-Casey (justincc)2011-07-081-3/+12
| | | | | | | | | | | | | | | | | | an existing one with the same id. We compare existing and loaded asset by doing an SHA1 on both, so that a changed library asset will still update the store. This cuts asset library load time from 10 seconds to <1 sec. Note, a fix on the previous commit revealed a bug where a library script cannot be copied except on the first login after a cache clear. This is unrelated to this commit and needs to be fixed at some subsequent time.
* | Merge branch 'master' into careminster-presence-refactorroot2011-06-302-61/+151
|\ \ | |/