| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | fix merge issues | UbitUmarov | 2017-07-20 | 1 | -30/+5 |
| | | |||||
| * | merge | UbitUmarov | 2017-07-20 | 1 | -23/+21 |
| |\ | |||||
| | * | revert EnvironmentTick back to orignal clock, since change may cause issues ↵ | UbitUmarov | 2017-06-19 | 1 | -24/+21 |
| | | | | | | | | | on some code paths. Clean a bit get mesh and get texture throttle | ||||
| * | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-27 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | make BlockingQueue.Dequeue timeouts more coerent (just less than watchdog ↵ | UbitUmarov | 2017-05-26 | 1 | -2/+2 |
| | | | | | | | | | timeout) | ||||
| * | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-25 | 1 | -6/+9 |
| |\ \ | |/ | |||||
| | * | minor changes | UbitUmarov | 2017-05-25 | 1 | -2/+5 |
| | | | |||||
| | * | make some threads background ones | UbitUmarov | 2017-05-25 | 1 | -1/+1 |
| | | | |||||
| | * | remove use of libomv BlockingQueue | UbitUmarov | 2017-05-25 | 1 | -3/+3 |
| | | | |||||
| * | | fix merge | UbitUmarov | 2017-01-05 | 1 | -12/+12 |
| |\ \ | |/ | |||||
| | * | Massive tab and trailing space cleanup | Melanie Thielker | 2017-01-05 | 1 | -15/+15 |
| | | | |||||
| * | | fix drop on delayed events processing | UbitUmarov | 2016-07-17 | 1 | -31/+58 |
| | | | |||||
| * | | add a Drop method to PollService Event handlers, Drop requests on ↵ | UbitUmarov | 2016-07-17 | 1 | -2/+4 |
| |/ | | | | connections known to be lost or delay event check if they are sending a response | ||||
| * | simplify http textures and meshs Throttles | UbitUmarov | 2016-07-16 | 1 | -21/+9 |
| | | |||||
| * | change threading on GetTexture and getMesh and WebFetch Modules. | UbitUmarov | 2015-11-27 | 1 | -16/+17 |
| | | |||||
| * | change threading on GetTexture and GetMesh NonSharable region modules | UbitUmarov | 2015-11-27 | 1 | -27/+22 |
| | | |||||
| * | remove some compile warnings increasing total number by 2 | UbitUmarov | 2015-11-21 | 1 | -4/+0 |
| | | |||||
| * | That didn't actually do anything for Simian, and it broke the locahost | Diva Canto | 2015-11-14 | 1 | -5/+6 |
| | | | | | | | | case Revert "Also restoring proper function for Simian external GetTexture functionality." This reverts commit 366e81b977e7fcad4b19aeedc6f3674612b7587b. | ||||
| * | Also restoring proper function for Simian external GetTexture functionality. | Diva Canto | 2015-10-14 | 1 | -6/+5 |
| | | |||||
| * | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 1 | -24/+9 |
| | | |||||
| * | bad merge? | UbitUmarov | 2015-09-01 | 1 | -28/+399 |
| |\ | |||||
| | * | turn off KeepAlive | UbitUmarov | 2015-08-24 | 1 | -3/+3 |
| | | | |||||
| | * | add a Retry-After response header to the 503 sent when we are 2 busy to do | UbitUmarov | 2015-08-19 | 1 | -0/+5 |
| | | | | | | | | | the request. just 503 could mean server down (?) | ||||
| | * | do keepalive on mesh and texture GET. Dont use reusecontext any where. | UbitUmarov | 2015-08-18 | 1 | -3/+3 |
| | | | | | | | | | | | | | setting of keepalive is wrong, it should follow the requested one ( or always as http1.1) only deny if needed (errors). KeepAlive may increase stress on number of avaiable file descritors. | ||||
| | * | Merge branch 'avination-current' into careminster | Melanie | 2013-09-16 | 1 | -23/+34 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | ||||
| | | * | Add support for simple external CAPS texture services | root | 2013-09-07 | 1 | -19/+31 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-08-01 | 1 | -10/+15 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | ||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-24 | 1 | -1/+1 |
| | |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | | | Send 503 when throttling textures | Melanie | 2013-04-25 | 1 | -1/+33 |
| | | | | | |||||
| | * | | | Prevent a failed user relogi from throwing exceptions in poll services | Melanie | 2012-12-14 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster | Melanie | 2012-11-20 | 1 | -60/+61 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | ||||
| | | * | | | * Prep work switching the GetMeshModule over to a poll service. | teravus | 2012-11-09 | 1 | -60/+61 |
| | | | | | | | | | | | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet. | ||||
| | * | | | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 1 | -14/+172 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | This implements the Caps throttler. After some testing, the system seemed ↵ | teravus | 2012-11-05 | 1 | -13/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference. Tested with Two Clients on a region with 1800 textures all visible at once. | ||||
| | | * | | | Another step in the chain. Pipe the throttle update to the appropriate ↵ | teravus | 2012-11-05 | 1 | -12/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator. Next step is hooking it up to HasEvents | ||||
| | | * | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵ | teravus | 2012-11-04 | 1 | -0/+42 |
| | | | | | | | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. | ||||
| | * | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -3/+0 |
| | |\ \ \ \ | | |/ / / | |/| / / | | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | ||||
| | * | | | Make texture sedning use only two threads to make things less harsh on bandwidth | Melanie | 2012-10-14 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | just remove the damm thing | UbitUmarov | 2012-09-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Seems nothing actually need the request body for getevents. so change | UbitUmarov | 2012-09-26 | 1 | -10/+2 |
| | | | | | | | | | | | | | | | | | control flag to false | ||||
| | * | | | more changes to PollService | UbitUmarov | 2012-09-26 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | missed change | UbitUmarov | 2012-09-25 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | change GetTextureModule processing | UbitUmarov | 2012-09-25 | 1 | -29/+31 |
| | | | | | |||||
| | * | | | Protect the responses map with a lock. Also remove ugly "this." type of | Melanie | 2012-09-23 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | member notation. | ||||
| | * | | | add some locks to GetTextureModule | UbitUmarov | 2012-09-17 | 1 | -10/+13 |
| | | | | | |||||
| | * | | | Revamp the HTTP textures handler to allow a maximum of four fetches | Melanie | 2012-09-14 | 1 | -44/+179 |
| | | | | | | | | | | | | | | | | | at any time and to drop requests for avatars n longer in the scene | ||||
| * | | | | Finished implementing redirects in GetTexture. | Diva Canto | 2014-05-07 | 1 | -3/+6 |
| | |_|/ |/| | | |||||
| * | | | Experimental comment to eneralize the handling of Linden caps when the | Mic Bowman | 2013-07-31 | 1 | -1/+5 |
| | |/ |/| | | | | | | | | | | | cap is something other than "localhost". A new interface for handling external caps is supported with an example implemented for Simian. The only linden cap supporting this interface right now is the GetTexture cap. | ||||
| * | | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 1 | -1/+1 |
| |/ | |||||
| * | Implement optional name and description on http stream handlers so that we ↵ | Justin Clark-Casey (justincc) | 2012-05-03 | 1 | -1/+3 |
| | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |