| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | Make the asset retrieval concurrency a config switch. The current value | Mic Bowman | 2012-10-04 | 1 | -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 endpoint | Melanie | 2012-09-30 | 1 | -3/+3 |
| | | | |||||
| * | | 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 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵ | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -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 careminster | Melanie | 2012-03-09 | 1 | -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 Canto | 2012-03-08 | 1 | -1/+20 |
| | | | | | | | | | pattern as suggested in the patch mantis #5921. Testing it in this smaller context to see how it works. | ||||
| * | | 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 | ||||
| | * | Move simulator asset info commands to an optional module from the connector. ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -43/+2 |
| | | | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled. | ||||
| * | | 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 | ||||
| | * | Adding commented out log messages and some minor formatting for future bug ↵ | Justin Clark-Casey (justincc) | 2012-01-02 | 1 | -0/+6 |
| | | | | | | | | | hunting. No functional changes. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-28 | 1 | -2/+19 |
| |\ \ | |/ | |||||
| | * | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 1 | -2/+19 |
| | | | |||||
| * | | Merge branch 'careminster-presence-refactor' into bigmerge | Melanie | 2011-10-06 | 1 | -8/+61 |
| |\ \ | |||||
| | * | | Change the asset connector to allow connection to different asset servers | Melanie | 2011-10-06 | 1 | -7/+61 |
| | | | | | | | | | | | | | depending on the first two digits of the asset id. | ||||
| * | | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -8/+48 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | When an uncached asset is requested multiple times concurrently, only load ↵ | Oren Hurvitz | 2011-07-21 | 1 | -9/+49 |
| | | | | | | | | | | | | | it once Signed-off-by: root <root@grid00001.t-data.com> | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -1/+0 |
| |\ \ | |/ | |||||
| | * | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵ | Diva Canto | 2011-04-12 | 1 | -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-refactor | Melanie | 2010-09-13 | 1 | -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 Canto | 2010-09-08 | 1 | -8/+15 |
| | | | | | | | | | instantiate the right network connectors. Tested on Robust only. | ||||
| | * | * Adds IAssetService.GetCached() to allow asset fetching from the local ↵ | John Hurliman | 2010-04-08 | 2 | -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-request | Tom Grimshaw | 2010-07-04 | 1 | -3/+3 |
| | | | |||||
| * | | Make sure the AssetServiceConnector times out within 30 seconds. If it ↵ | Tom Grimshaw | 2010-07-03 | 1 | -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 Grimshaw | 2010-07-01 | 1 | -3/+2 |
| | | | | | | | | | if it enters a retry queue | ||||
| * | | Fix build break | Tom Grimshaw | 2010-07-01 | 1 | -1/+1 |
| | | | |||||
| * | | Report asset upload success if it has previously failed | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 |
| | | | |||||
| * | | Catch newid == null which is what happens if the asset service is offline ↵ | Tom Grimshaw | 2010-07-01 | 1 | -0/+4 |
| | | | | | | | | | (seems a connection failure does not throw an exception) | ||||
| * | | The other half of the asset fix. Implement an exponentially incrementing ↵ | Tom Grimshaw | 2010-06-29 | 1 | -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-refactor | Melanie | 2010-04-13 | 2 | -0/+22 |
| |\ \ | |/ |/| | |||||
| | * | Backported GetTextureModule and IAssetService.GetCached() | John Hurliman | 2010-04-08 | 2 | -0/+22 |
| | | | |||||
| * | | * Typo fixes | John Hurliman | 2010-03-09 | 1 | -1/+1 |
| | | | | | | | | | * Performance improvement in the expensive GenerateClientFlags() | ||||
| * | | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim ↵ | John Hurliman | 2010-02-22 | 1 | -1/+1 |
| |\ \ | |/ | | | | | into presence-refactor | ||||
| | * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -1/+1 |
| | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |