aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-011-10/+0
|\
| * Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-301-10/+0
| | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
* | Merge branch 'master' into careminsterMelanie2012-05-271-1/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Make ISimulationScene.GetScene() used the more efficient region id for ↵Justin Clark-Casey (justincc)2012-05-241-1/+11
| | | | | | | | lookup rather than the region handle.
* | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-261-5/+15
| | | | | | | | more lobe ?
* | Merge branch 'master' into careminsterMelanie2012-03-311-1/+9
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵Justin Clark-Casey (justincc)2012-03-301-0/+8
| | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc.
| * refactor: Stop passing both IClientAPI and agentID to friend event ↵Justin Clark-Casey (justincc)2012-03-291-1/+1
| | | | | | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
* | Merge branch 'master' into careminsterMelanie2012-03-221-1/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-211-1/+3
| | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
* | Merge branch 'master' into careminsterMelanie2012-03-211-0/+13
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-201-0/+11
| | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
| * Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵Diva Canto2012-03-171-0/+2
| | | | | | | | direct user connections.
* | Merge branch 'master' into careminsterMelanie2012-02-231-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-1/+1
| | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | Merge branch 'master' into careminsterMelanie2012-01-301-1/+8
|\ \ | |/
| * Next step for world map overlaysMelanie2012-01-301-1/+8
| |
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-161-1/+2
| |
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-161-1/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Profile UpdatesBlueWall2012-01-031-0/+1
| | | | | | | | 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-0/+4
|\ \ | |/ | | | | | | | | | | | | 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
| * 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.
| * Added field LocalToGrid in UserAccount. Context: make HG work in Simian.Diva Canto2011-12-291-0/+8
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * HG: Renamed one methodDiva Canto2011-12-041-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-191-4/+17
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Improve some grid region log messages to express regions at co-ordinate ↵Justin Clark-Casey (justincc)2011-11-191-4/+17
| | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000)
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-251-0/+26
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-241-0/+26
| | | | | | | | | | 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 '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-121-2/+2
|\ \ | |/
| * When creating a new user on the comand line, give the option of allowing a ↵Justin Clark-Casey (justincc)2011-10-041-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.Tom2011-09-141-3/+1
|\ \ | |/
| * 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-044-18/+32
|\ \ | |/
| * 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
| * Change GridService.GetRegionByName() to only return info if there is an ↵Justin Clark-Casey (justincc)2011-08-021-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-021-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-231-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-refactorMelanie2011-06-131-2/+4
|\ \ | |/
| * First pass at making the V2 map work. Standalones only for now. There are ↵Diva Canto2011-06-121-2/+4
| | | | | | | | some issues with the zoom level -- TBD.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-092-1/+28
|\ \ | |/
| * This hopefully fixes all issues with online/offline notifications across ↵Diva Canto2011-06-071-1/+2
| | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528
| * This fixes the crash reported in ↵Diva Canto2011-06-071-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 Canto2011-06-021-1/+1
| |
| * HG IM in grid mode working fairly well. Unknown target user references ↵Diva Canto2011-05-261-0/+3
| | | | | | | | looked back in source user's User Agent service.