aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-09-071-0/+6
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-021-0/+6
| | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
* | Merge branch 'master' into careminsterMelanie2013-08-172-9/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * minor: remove mono compiler warnings from OpenSim/Services/Connectors/SimianGridJustin Clark-Casey (justincc)2013-08-172-9/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-08-072-3/+11
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Remove some debugging from simian connectors.Mic Bowman2013-08-052-3/+11
| |
* | Merge branch 'master' into careminsterMelanie2013-08-0112-282/+757
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-311-0/+179
| | | | | | | | | | | | | | cap is something other than "localhost". A new interface for handling external caps is supported with an example implemented for Simian. The only linden cap supporting this interface right now is the GetTexture cap.
| * A pretty major restructuring of the simian method invocations in order toMic Bowman2013-07-3111-282/+578
| | | | | | | | | | | | | | service access capabilities. In conjunction with the corresponding Simian updates, this enables explicit per-simulator capability-based access to grid services. That enables grid owners to add or revoke access to the grid on a simulator by simulator basis.
* | Merge branch 'master' into careminsterMelanie2013-07-181-5/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * Remove a null reference exception in SimianPresenceServiceConnector thatRobert Adams2013-07-101-4/+8
| | | | | | | | occurs when GetGridUserInfo cannot find the requested user info.
| * Simina activity detector was too eager. Disabled it in case simian is not ↵Diva Canto2013-07-061-1/+2
| | | | | | | | being used.
* | Merge branch 'master' into careminsterMelanie2013-04-101-110/+83
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Optimize the number of Simian calls to get the initial presenceMic Bowman2013-04-071-110/+83
| | | | | | | | | | | | information for the friends list. This is a pretty big performance improvement on login. Note that you must upgrade simian to incorporate the corresponding GetSessions call.
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+3
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+3
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' into careminsterMelanie2013-02-271-22/+25
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-271-22/+25
| | | | | | | | places where we were not already.
* | Merge branch 'master' into careminsterMelanie2012-11-171-1/+0
|\ \ | |/
| * Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-171-1/+0
| | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
* | Merge branch 'master' into careminsterMelanie2012-11-137-7/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-127-7/+7
| |
* | Merge branch 'master' into careminsterMelanie2012-10-121-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵Justin Clark-Casey (justincc)2012-10-091-2/+2
| | | | | | | | easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
| * Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-302-6/+1
| | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
| * Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-302-1/+6
| | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* | Merge branch 'master' into careminsterMelanie2012-09-091-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * 4096 is used in various places as the maximum height of a region, ↵SignpostMarv2012-09-081-2/+2
| | | | | | | | refactoring to be a constant
* | fix vs2010 buildUbitUmarov2012-08-161-0/+1
| |
* | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-151-0/+5
| | | | | | | | script needs this for proper logging.
* | Merge branch 'master' into careminsterMelanie2012-06-121-21/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent ↵Justin Clark-Casey (justincc)2012-06-121-21/+7
| | | | | | | | | | | | | | rather than scanning all scene for the presence with the right id Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions. This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
* | Merge branch 'master' into careminsterMelanie2012-03-141-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-161-0/+4
| |
* | 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
|\ \ | |/
generated by cgit v1.1 at 2024-09-12 18:18:37 +0000