Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+17 |
|\ | |||||
| * | Add note to docs | BlueWall | 2011-10-07 | 1 | -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 bigmerge | Melanie | 2011-10-12 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Added back UserAccount that creates random UUID for new account. | BlueWall | 2011-10-05 | 1 | -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 bigmerge | Melanie | 2011-10-12 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | When creating a new user on the comand line, give the option of allowing a ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -2/+2 |
| | | | | | | | | | | | | 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. | ||||
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -3/+1 |
|\ \ | |/ | |||||
| * | In SetAttachment, if the existing attachment has no asset id then carry on ↵ | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -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 1 | Tom | 2011-09-04 | 4 | -18/+32 |
|\ \ | |/ | |||||
| * | Don't need to try both AssetService.Get and GetCached in GetMesh since Get ↵ | Justin Clark-Casey (justincc) | 2011-08-18 | 1 | -2/+6 |
| | | | | | | | | always calls GetCached and code paths were identical | ||||
| * | Change GridService.GetRegionByName() to only return info if there is an ↵ | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -0/+6 |
| | | | | | | | | | | | | | | 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. | ||||
| * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -2/+2 |
| | | | | | | | | 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. | ||||
| * | Pass the first name and last name from the agent circuit data to the ↵ | Justin Clark-Casey (justincc) | 2011-07-23 | 1 | -14/+18 |
| | | | | | | | | | | | | | | | | | | | | 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-refactor | Melanie | 2011-06-13 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | First pass at making the V2 map work. Standalones only for now. There are ↵ | Diva Canto | 2011-06-12 | 1 | -2/+4 |
| | | | | | | | | some issues with the zoom level -- TBD. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -1/+28 |
|\ \ | |/ | |||||
| * | This hopefully fixes all issues with online/offline notifications across ↵ | Diva Canto | 2011-06-07 | 1 | -1/+2 |
| | | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528 | ||||
| * | This fixes the crash reported in ↵ | Diva Canto | 2011-06-07 | 1 | -1/+1 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully. | ||||
| * | Bug fix on HG IM. | Diva Canto | 2011-06-02 | 1 | -1/+1 |
| | | |||||
| * | HG IM in grid mode working fairly well. Unknown target user references ↵ | Diva Canto | 2011-05-26 | 1 | -0/+3 |
| | | | | | | | | looked back in source user's User Agent service. | ||||
| * | HG: Renamed, shuffled some interfaces around. Move them all to ↵ | Diva Canto | 2011-05-25 | 2 | -45/+9 |
| | | | | | | | | IHypergridServices. | ||||
| * | HG: Instant Message working. Tested on HG standalones only. Needs a lot more ↵ | Diva Canto | 2011-05-25 | 2 | -0/+13 |
| | | | | | | | | testing. | ||||
| * | Added necessary code to drop inventory on hg friends using the profile ↵ | Diva Canto | 2011-05-24 | 1 | -0/+1 |
| | | | | | | | | window, but can't test because this mechanism doesn't seem to work without a profile service. | ||||
| * | HG friends: Status notifications working. Also initial logins get the online ↵ | Diva Canto | 2011-05-23 | 2 | -0/+43 |
| | | | | | | | | friends in other grids. | ||||
| * | More on HG Friends. Added Delete(string, string) across the board. Added ↵ | Diva Canto | 2011-05-22 | 1 | -0/+1 |
| | | | | | | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back. | ||||
| * | Fixed permissions bug related to friends in PermissionsModule. Added ↵ | Diva Canto | 2011-05-21 | 1 | -0/+1 |
| | | | | | | | | FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work. | ||||
| * | HG Friends working to some extent: friendships offered and accepted ↵ | Diva Canto | 2011-05-19 | 1 | -1/+1 |
| | | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵ | Diva Canto | 2011-04-28 | 1 | -1/+1 |
| | | | | | | | | the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Make all the objects in a coalescence reappears after being loaded from an ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -0/+5 |
| | | | | | | | | | | | | | | IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing. From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug. It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: add a bit more method doc to IInventoryService.GetItem() | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | Add log messages on teleport failure to better pin down the cause. | Justin Clark-Casey (justincc) | 2011-03-09 | 1 | -0/+7 |
| | | |||||
| * | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 1 | -1/+1 |
| | | |||||
| * | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -1/+1 |
| | | |||||
| * | Implement Scope ID lookup on GetLandData. Stacked regions were not handled | Melanie | 2011-01-03 | 1 | -1/+1 |
| | | | | | | | | properly | ||||
* | | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 1 | -1/+1 |
| | | |||||
* | | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -1/+1 |
| | | |||||
* | | Add a careminster API to scripting again | Melanie | 2011-01-24 | 1 | -0/+4 |
| | | |||||
* | | Implement Scope ID lookup on GetLandData. Stacked regions were not handled | Melanie | 2010-12-31 | 1 | -1/+1 |
| | | | | | | | | properly | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 |
| | | |||||
| * | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+2 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+2 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -2/+15 |
|\ \ | |/ | |||||
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -1/+4 |
| |\ | |||||
| * \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -1/+28 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -28/+80 |
| |\ \ \ |