| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | missing file change.. actually use watchdog threads on assetsconnector and | UbitUmarov | 2017-05-26 | 1 | -3/+8 |
| | | | | | avoid null refs on JobEngine | ||||
| * | use threads from main pool on assetsconnector | UbitUmarov | 2017-05-25 | 1 | -3/+1 |
| | | |||||
| * | minor changes | UbitUmarov | 2017-05-25 | 1 | -2/+3 |
| | | |||||
| * | make some threads background ones | UbitUmarov | 2017-05-25 | 1 | -0/+1 |
| | | |||||
| * | remove use of libomv BlockingQueue | UbitUmarov | 2017-05-25 | 1 | -2/+2 |
| | | |||||
| * | Refactor asset handling as per Ubit's suggestion | Melanie Thielker | 2017-02-01 | 1 | -23/+12 |
| | | |||||
| * | Make negative asset caching actually work | Melanie Thielker | 2017-01-30 | 1 | -6/+31 |
| | | | | | | | Also fixes some merge artefacts in HGAssetBroker where cached assets were requested but not actually used and completely squelch a materials debug message because there is nothing the user can do to fix it anyway. | ||||
| * | Massive tab and trailing space cleanup | Melanie Thielker | 2017-01-05 | 1 | -11/+11 |
| | | |||||
| * | Add negative caching to flotsam cache. Prevents scripts from hammering the ↵ | Melanie Thielker | 2016-12-29 | 1 | -2/+7 |
| | | | | | asset server | ||||
| * | Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache ↵ | Melanie Thielker | 2016-12-29 | 1 | -2/+2 |
| | | | | | is long gone. | ||||
| * | on get asset with callback, do the callback even if asset not found. This is ↵ | UbitUmarov | 2016-11-03 | 1 | -34/+17 |
| | | | | | needed on same cases | ||||
| * | change asset upload retry timer AutoReset back to true | UbitUmarov | 2016-09-01 | 1 | -5/+14 |
| | | |||||
| * | change MAXSENDRETRIESLEN from test value to normal | UbitUmarov | 2016-09-01 | 1 | -2/+2 |
| | | |||||
| * | assets uploads to grid. Change the retry code. Stop using ↵ | UbitUmarov | 2016-09-01 | 1 | -78/+128 |
| | | | | | asset.UploadAttempts field that should be removed | ||||
| * | adjust the checks for invalid asset IDs. changed upload fail detection | UbitUmarov | 2015-12-19 | 1 | -16/+16 |
| | | |||||
| * | Restored authentication in AssetServicesConnector. | Diva Canto | 2015-10-14 | 1 | -2/+2 |
| | | |||||
| * | fix bad side efects of missing avination optional configuration | UbitUmarov | 2015-09-15 | 1 | -11/+16 |
| | | |||||
| * | revert SynchronousRestObjectRequester timeout to miliseconds, and fix where ↵ | UbitUmarov | 2015-09-09 | 1 | -2/+2 |
| | | | | | it was wrong set in seconds | ||||
| * | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 1 | -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 Canto | 2015-09-04 | 1 | -1/+0 |
| | | | | | | | | | OpenSim.Framework. | ||||
| * | | at last we can login and see objects ( friends is dead and disable in | UbitUmarov | 2015-09-03 | 1 | -1/+1 |
| | | | | | | | | | scenepresence) | ||||
| * | | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 1 | -58/+2 |
| | | | |||||
| * | | bad merge? | UbitUmarov | 2015-09-01 | 1 | -41/+306 |
| |\ \ | |/ |/| | |||||
| | * | dont give a ring to each asset request, just one to rule them all, i mean | UbitUmarov | 2014-09-18 | 1 | -8/+15 |
| | | | | | | | | | thread not ring | ||||
| | * | and another one | UbitUmarov | 2014-09-17 | 1 | -1/+6 |
| | | | |||||
| | * | Merge branch 'avination-current' into careminster | Melanie | 2013-09-16 | 1 | -1/+7 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | ||||
| | | * | Fix exception when brokering HG asset ids | Melanie Thielker | 2013-09-08 | 1 | -1/+7 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 1 | -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 careminster | Melanie | 2012-10-07 | 1 | -16/+21 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | ||||
| | | * | | Fix threading in remote asset connector | Melanie | 2012-10-05 | 1 | -16/+21 |
| | | | | | |||||
| | * | | | Merge branch 'master' into careminster | Melanie | 2012-10-07 | 1 | -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. | Melanie | 2012-09-14 | 1 | -37/+67 |
| | | | | | |||||
| | * | | | Allow setting max connections for an endpoint | Melanie | 2012-09-14 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Prevent double slashes, try #4 | UbitUmarov | 2012-09-06 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Prevent double slashes, try #3 | Melanie | 2012-09-06 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Revert "Change string concatenation to Path.Combine to eliminate extra slashes." | Melanie | 2012-09-06 | 1 | -8/+6 |
| | | | | | | | | | | | | | | | | | This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9. | ||||
| | * | | | Change string concatenation to Path.Combine to eliminate extra slashes. | Melanie | 2012-09-06 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | Windoze barfs on them. | ||||
| | * | | | Revert " remove extra '/' in assets url" | Melanie | 2012-09-06 | 1 | -13/+6 |
| | | | | | | | | | | | | | | | | | This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486. | ||||
| | * | | | remove extra '/' in assets url | UbitUmarov | 2012-09-06 | 1 | -6/+13 |
| | | | | | |||||
| | * | | | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 1 | -5/+29 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | | * | | | be paranoic (?) | UbitUmarov | 2012-07-11 | 1 | -0/+6 |
| | | | | | | |||||
| | | * | | | Replace a Multicast Delegate by a simple list of delegates in access Get | UbitUmarov | 2012-07-11 | 1 | -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 careminster | Melanie | 2012-05-10 | 1 | -0/+0 |
| | |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 1 | -1/+20 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | | | | Fix up asset stuff | Melanie | 2012-01-06 | 1 | -0/+3 |
| | | | | | | | |||||
| | * | | | | | Remove a dangling command registration | Melanie | 2012-01-05 | 1 | -4/+0 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -39/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | ||||
| | * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -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 careminster | Melanie | 2011-12-28 | 1 | -2/+19 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'careminster-presence-refactor' into bigmerge | Melanie | 2011-10-06 | 1 | -8/+61 |
| | |\ \ \ \ \ \ \ \ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |