Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | 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. | ||||
* | | | 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 | ||||
| * | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 1 | -1/+1 |
| | | |||||
* | | 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 | ||||
* | 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. | ||||
* | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-08-16 | 1 | -2/+3 |
| | |||||
* | comment out some of the currently less useful debug log messages | Justin Clark-Casey (justincc) | 2011-08-11 | 1 | -2/+2 |
| | |||||
* | Test m_Enabled on RemoveRegion. | Diva Canto | 2011-05-04 | 1 | -0/+3 |
| | |||||
* | Refactored the GetMesh module into a handler and a module, to be the same as ↵ | Diva Canto | 2011-05-02 | 1 | -0/+2 |
| | | | | GetTexture. | ||||
* | Works! | Diva Canto | 2011-05-02 | 1 | -5/+22 |
| | |||||
* | Start to drill down on GetTexture. Read the config and do different things. | Diva Canto | 2011-05-01 | 1 | -4/+12 |
| | |||||
* | Change GetTextureModule.cs to conform to the new IRegion module interface. ↵ | Diva Canto | 2011-05-01 | 1 | -6/+21 |
| | | | | NOTHING OF THIS WORKS. Compiles. | ||||
* | Added OpenSim.Capabilities.Handlers. For the moment it has only the ↵ | Diva Canto | 2011-05-01 | 1 | -311/+4 |
| | | | | GetTexture handler. The region module in Linden space uses it. WARNING: nothing of this works yet, it just compiles. | ||||
* | Nope, that didn't feel right. Moving all those modules to Linden space. | Diva Canto | 2011-04-30 | 1 | -0/+404 |