aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | 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
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| * | | | | 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
| * \ \ \ \ \ 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
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2011-12-281-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
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-1/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ 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.
| * | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Backported GetTextureModule and IAssetService.GetCached()John Hurliman2010-04-082-0/+22
| | | | | | | | | | | | |
* | | | | | | | | | | | | 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-022-38/+87
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | |
generated by cgit v1.1 at 2025-02-14 04:23:31 +0000