aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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.
* | 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
| * 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
| |
* | 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
| * | be paranoic (?)UbitUmarov2012-07-111-0/+6
| | |
| * | Replace a Multicast Delegate by a simple list of delegates in access GetUbitUmarov2012-07-111-5/+23
| | | | | | | | | | | | | | | Can't seen more than one evocation on the multicast on this case, even expanding its evocation list (as it should be used in case one fails). With the list i do see what we want.
* | | Merge branch 'master' into careminsterMelanie2012-05-101-0/+0
|\ \ \ | |/ / |/| / | |/
| * Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵Justin Clark-Casey (justincc)2012-05-091-0/+0
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-03-091-1/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * HG inventory/asset transfers: serialize asset posts. I'm using the same ↵Diva Canto2012-03-081-1/+20
| | | | | | | | pattern as suggested in the patch mantis #5921. Testing it in this smaller context to see how it works.
* | Fix up asset stuffMelanie2012-01-061-0/+3
| |
* | Remove a dangling command registrationMelanie2012-01-051-4/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-061-39/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Move simulator asset info commands to an optional module from the connector. ↵Justin Clark-Casey (justincc)2012-01-051-43/+2
| | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled.
* | Merge branch 'master' into careminsterMelanie2012-01-021-0/+2
|\ \ | |/ | | | | | | | | | | | | 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
| * Adding commented out log messages and some minor formatting for future bug ↵Justin Clark-Casey (justincc)2012-01-021-0/+6
| | | | | | | | hunting. No functional changes.
* | Merge branch 'master' into careminsterMelanie2011-12-281-2/+19
|\ \ | |/
| * HG: more / love for XmasDiva Canto2011-12-241-2/+19
| |
* | Merge branch 'careminster-presence-refactor' into bigmergeMelanie2011-10-061-8/+61
|\ \
| * | Change the asset connector to allow connection to different asset serversMelanie2011-10-061-7/+61
| | | | | | | | | | | | depending on the first two digits of the asset id.
* | | Resolve merge commits, stage 1Tom2011-09-041-8/+48
|\ \ \ | |/ / |/| / | |/
| * When an uncached asset is requested multiple times concurrently, only load ↵Oren Hurvitz2011-07-211-9/+49
| | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com>
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-1/+0
|\ \ | |/
| * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵Diva Canto2011-04-121-1/+0
| | | | | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-8/+15
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * Made the HG asset and inventory brokers use the Helo service in order to ↵Diva Canto2010-09-081-8/+15
| | | | | | | | instantiate the right network connectors. Tested on Robust only.
| * * Adds IAssetService.GetCached() to allow asset fetching from the local ↵John Hurliman2010-04-082-0/+22
| | | | | | | | | | | | | | cache only * Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer * Sanity check for null reference in LLClientView.RefreshGroupMembership()
* | Check cached asset to make sure it contains data, and if not, re-requestTom Grimshaw2010-07-041-3/+3
| |
* | Make sure the AssetServiceConnector times out within 30 seconds. If it ↵Tom Grimshaw2010-07-031-2/+2
| | | | | | | | doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue.
* | Cache all assets on upload so that the client can still retrieve the asset ↵Tom Grimshaw2010-07-011-3/+2
| | | | | | | | if it enters a retry queue
* | Fix build breakTom Grimshaw2010-07-011-1/+1
| |
* | Report asset upload success if it has previously failedTom Grimshaw2010-07-011-0/+4
| |
* | Catch newid == null which is what happens if the asset service is offline ↵Tom Grimshaw2010-07-011-0/+4
| | | | | | | | (seems a connection failure does not throw an exception)
* | The other half of the asset fix. Implement an exponentially incrementing ↵Tom Grimshaw2010-06-291-11/+88
| | | | | | | | retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets.
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-132-0/+22
|\ \ | |/ |/|
generated by cgit v1.1 at 2024-11-07 10:04:04 +0000