aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Restored authentication in AssetServicesConnector.Diva Canto2015-10-141-2/+2
|
* fix bad side efects of missing avination optional configurationUbitUmarov2015-09-151-11/+16
|
* revert SynchronousRestObjectRequester timeout to miliseconds, and fix where ↵UbitUmarov2015-09-091-2/+2
| | | | it was wrong set in seconds
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-1/+0
|\ | | | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to ↵Diva Canto2015-09-041-1/+0
| | | | | | | | OpenSim.Framework.
* | at last we can login and see objects ( friends is dead and disable inUbitUmarov2015-09-031-1/+1
| | | | | | | | scenepresence)
* | seems to compile ( tests comented out)UbitUmarov2015-09-021-58/+2
| |
* | bad merge?UbitUmarov2015-09-011-41/+306
|\ \ | |/ |/|
| * dont give a ring to each asset request, just one to rule them all, i meanUbitUmarov2014-09-181-8/+15
| | | | | | | | thread not ring
| * and another oneUbitUmarov2014-09-171-1/+6
| |
| * Merge branch 'avination-current' into careminsterMelanie2013-09-161-1/+7
| |\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| | * Fix exception when brokering HG asset idsMelanie Thielker2013-09-081-1/+7
| | |
| * | Merge branch 'master' into careminsterMelanie2013-07-181-0/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'avination' into careminsterMelanie2012-10-071-16/+21
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| | * | Fix threading in remote asset connectorMelanie2012-10-051-16/+21
| | | |
| * | | Merge branch 'master' into careminsterMelanie2012-10-071-2/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | | Sequence/throttle asset retrievals.Melanie2012-09-141-37/+67
| | | |
| * | | Allow setting max connections for an endpointMelanie2012-09-141-2/+2
| | | |
| * | | Prevent double slashes, try #4UbitUmarov2012-09-061-1/+1
| | | |
| * | | Prevent double slashes, try #3Melanie2012-09-061-0/+3
| | | |
| * | | Revert "Change string concatenation to Path.Combine to eliminate extra slashes."Melanie2012-09-061-8/+6
| | | | | | | | | | | | | | | | This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9.
| * | | Change string concatenation to Path.Combine to eliminate extra slashes.Melanie2012-09-061-6/+8
| | | | | | | | | | | | | | | | Windoze barfs on them.
| * | | Revert " remove extra '/' in assets url"Melanie2012-09-061-13/+6
| | | | | | | | | | | | | | | | This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486.
| * | | remove extra '/' in assets urlUbitUmarov2012-09-061-6/+13
| | | |
| * | | Merge branch 'avination' into careminsterMelanie2012-07-161-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Merge branch 'master' into careminsterMelanie2012-05-101-31/+165
| | | |
* | | | Close streams immediately when we finish using themOren Hurvitz2014-07-211-15/+17
| | | |
* | | | Adds optional HTTP Basic Authentication to Robust service connectors.Diva Canto2014-05-231-9/+10
| | | |
* | | | Fix recent asset request timeout issue by commenting out (for now) the ↵Justin Clark-Casey (justincc)2014-05-141-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_maxAssetRequestConcurrency mistakenly passed in as a timeout to SynchronousRestObjectRequester.MakeRequest() For a long time, possibly forever, the m_maxAssetRequestConcurrency was mistakenly passed in as a 30 ms timeout rather than as a concurrent connection limiter. This didn't come to light until the timeout was actually used in recent commit faf9ba53 Since this hasn't been operational for a long time and in release candidate phase, commenting it out for now though will need to revisit this. Relates to http://opensimulator.org/mantis/view.php?id=7165
* | | | Workaround for SRAS: if Store Asset returns 'null' then assume the asset ↵Oren Hurvitz2014-04-231-0/+7
| | | | | | | | | | | | | | | | already exists, and this isn't an error
* | | | Better error-handling when storing assets: recognize that 'null' is an error ↵Oren Hurvitz2014-04-201-12/+11
| | | | | | | | | | | | | | | | value
* | | | Added assets service method AssetsExist(), which returns whether the given ↵Oren Hurvitz2014-04-021-0/+21
| |_|/ |/| | | | | | | | | | | | | | list of assets exist. This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
* | | Added property to make for more flexible testing.Diva Canto2013-07-111-0/+5
| | |
* | | Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-101-1/+1
| |/ |/| | | | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future.
* | Make the asset retrieval concurrency a config switch. The current valueMic Bowman2012-10-041-3/+8
| | | | | | | | | | of 30 is still hanging badly on some mono versions. The switch defaults to 30 to preserve current behavior.
* | Allow setting max connections for an endpointMelanie2012-09-301-3/+3
|/
* Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵Justin Clark-Casey (justincc)2012-05-091-0/+329
the actual class names. This is usually because the file name was singular (*Service*) but the class name was plural (*Services*). This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector. This does not affect existing configuration since the files are being renamed rather than the classes.
generated by cgit v1.1 at 2024-07-16 17:37:36 +0000