aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add methods to allow the groups modules to query online status and last loginMelanie2012-01-161-0/+4
|
* 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
| * Set the local grid flag in the user account through the simian connectorMic Bowman2011-12-291-0/+4
| | | | | | | | This should make bi-directional hypergrid work.
* | Merge branch 'master' into careminsterMelanie2011-12-242-0/+5
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-231-25/+56
| |\
| * | HG: AAdded a few missing /'s at the end of URLsDiva Canto2011-12-232-0/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-231-25/+56
|\ \ \ | | |/ | |/|
| * | Enables processing of hypergrid links through simiangrid services. ThanksMic Bowman2011-12-221-25/+56
| |/ | | | | | | otakup0pe
* | Merge branch 'master' into bigmergeMelanie2011-11-241-1/+3
|\ \ | |/
| * Append asset ID to URL for storage requests to allow caching proxies to work ↵Dan Lake2011-11-231-1/+3
| | | | | | | | with Simian
* | 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-251-0/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-241-0/+10
| | | | | | | | | | 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
* | Resolve merge commits, stage 1Tom2011-09-042-3/+3
|\ \ | |/
| * comment out some of the currently less useful debug log messagesJustin Clark-Casey (justincc)2011-08-111-1/+1
| |
| * 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.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-4/+21
|\ \ | |/
| * More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-221-1/+6
| | | | | | | | 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 Canto2011-05-211-3/+15
| | | | | | | | 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 Canto2011-05-191-1/+1
| | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+262
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs
| * Convert SimianMaptile refresh time from ms to seconds. Too many 0'sMic Bowman2011-02-041-11/+12
| | | | | | | | in the config file.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-184-23/+22
|\ \ | |/
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-01-181-2/+2
| |
| * Reduce amount of debug lopgging put out by some simiangrid connectors. ↵Justin Clark-Casey (justincc)2011-01-184-21/+20
| | | | | | | | Please re-enable if needed.
| * Moved the map tile processing used by the Simian GridMic Bowman2011-01-082-86/+261
| | | | | | | | | | | | Frontend into a separate region module. Configuration settings added to the defaults ini file. Others may find this useful for pushing map tiles to a separate server.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-062-4/+2
|\ \ | |/
| * comment out a couple simian debug messagesMic Bowman2011-01-052-4/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-301-68/+50
|\ \ | |/
| * Update SimianGridServicesConnector to work more likeMic Bowman2010-12-271-68/+50
| | | | | | | | | | a connector so we can take advantage of the logic in RemoteGridServicesConnector.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-3/+1
|\ \ | |/
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-211-0/+2
| |\
| * \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-211-3/+3
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-26/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| * \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-1/+81
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to beMelanie2010-11-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password.
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-0/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-211-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255).
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-091-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Formatting cleanup.Jeff Ames2010-11-081-3/+3
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-26/+27
|\ \ \ \ | |/ / /
| * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-301-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-291-1/+81
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-291-1/+81
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-211-1/+81
| | |\ \ \ | | | | |/ | | | |/| | | | | | dev-appearance
generated by cgit v1.1 at 2024-12-20 16:18:34 +0000