aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetTexture (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed Robust-bound GetTexture handler that had been knocked off with the new ↵Diva Canto2015-10-142-3/+434
| | | | sim-bound handler that uses a Poll service. Rather than hammering both handlers into one single class, I'm splitting them into 2 classes, because they are considerably different.
* seems to compile ( tests comented out)UbitUmarov2015-09-022-4/+1
|
* bad merge?UbitUmarov2015-09-013-113/+119
|\
| * turn off KeepAliveUbitUmarov2015-08-241-2/+2
| |
| * do keepalive on mesh and texture GET. Dont use reusecontext any where.UbitUmarov2015-08-181-2/+2
| | | | | | | | | | | | 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 'master' into careminsterMelanie2013-11-231-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * \ Merge branch 'master' into careminsterMelanie2013-06-111-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * \ \ Merge branch 'avination' into careminsterMelanie2013-01-231-4/+19
| |\ \ \
| | * | | * A better way to handle the last fix (This is in case the viewer provides a ↵teravus2013-01-211-10/+16
| | | | | | | | | | | | | | | | | | | | list of preferred formats, though, technically, the sim would pick the first provided format the old way). This just makes it more obvious what's happening.
| | * | | * The fallthrough of FetchTexture was no longer resulting in a 404 response ↵teravus2013-01-211-1/+10
| | | | | | | | | | | | | | | | | | | | on missing textures. It was just waiting and no event was being provided. This re-enables the 404 response.
| * | | | Merge branch 'master' into careminsterMelanie2012-12-071-1/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * | | | | Merge branch 'avination' into careminsterMelanie2012-11-171-1/+5
| |\ \ \ \ \
| | * | | | | Another step in the chain. Pipe the throttle update to the appropriate ↵teravus2012-11-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-09-271-11/+20
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * | | | | don't send a partial contents report if we are sending all dataUbitUmarov2012-09-261-10/+15
| | | | | | |
| | * | | | | fix GetTextureHandler rangeUbitUmarov2012-09-261-1/+5
| | | | | | |
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-09-163-105/+80
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| | * | | | | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-143-97/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | at any time and to drop requests for avatars n longer in the scene
| * | | | | | Merge branch 'master' into careminsterMelanie2012-09-071-7/+29
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-07-061-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | | | Changed GetTexture error code RequestedRangeNotSatisfiable to NotFound, ↵UbitUmarov2012-07-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since viewers don't seem to handle that and keep retrying
* | | | | | | | refactor: consistently put all test classes in the OpenSim.Tests.Common ↵Justin Clark-Casey (justincc)2014-11-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package rather than some in OpenSim.Tests.Common.Mock the separate mock package was not useful and was just another using line to always add
* | | | | | | | Fix issue with TestTextureNotFound in previous commit 1e3027aJustin Clark-Casey (justincc)2014-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop failure by actually giving the test handler a path instead of null
* | | | | | | | Revert "Removed unused files: Texture/Mesh server connectors"root2014-07-211-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f6ea5088f4cc76eddb05b20b5d768f761b0fbd15.
* | | | | | | | Removed unused files: Texture/Mesh server connectorsOren Hurvitz2014-07-211-71/+0
| | | | | | | |
* | | | | | | | Fix test breakageDiva Canto2014-05-081-1/+1
| | | | | | | |
* | | | | | | | Make the URL for texture redirects match the path of the resource that we ↵Diva Canto2014-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use in OpenSim.
* | | | | | | | Finished implementing redirects in GetTexture.Diva Canto2014-05-073-6/+12
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | | | | | | Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-081-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to print various counts of capability invocation by user and by cap This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected. This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle() However, existing inheriting classes overriding Handle() will still work, albeit without stats recording. "show caps" becomes "show caps list" to disambiguate between show caps commands
* | | | | | Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-101-0/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future.
* | | | | minor: change method doc on GetTextureHandler.TryParseRange(), mainly to ↵Justin Clark-Casey (justincc)2012-12-061-2/+2
| | | | | | | | | | | | | | | | | | | | trigger another build
* | | | | Allow GetTexture calls with no second value in the range header (e.g. just ↵Justin Clark-Casey (justincc)2012-12-061-1/+34
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 5333-) It looks like the latest Kokua is doing this. As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html, leaving off the second value is legal This indicates the caller wants the rest of the entity.
* | | | Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-241-1/+1
| | | | | | | | | | | | | | | | automatically turns off any logging enabled between tests
* | | | minor: Comment out "Client requested range for texture ... but" message. ↵Justin Clark-Casey (justincc)2012-10-121-3/+3
| |_|/ |/| | | | | | | | This is not useful during normal operation.
* | | If the GetTexture capability receives a request for a range of data beyond ↵Justin Clark-Casey (justincc)2012-09-061-5/+29
|/ / | | | | | | | | | | | | | | | | | | that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable. This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests. This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size. I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank. If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution. However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
* | Don't include time to transmit response back to requester when assessing ↵Justin Clark-Casey (justincc)2012-06-131-2/+0
| | | | | | | | | | | | | | | | | | | | slow handling of requests. This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response. This is not something we can do much about on the server end - it's server-side delay that we're interested in. To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change. IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this. Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
* | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-033-6/+6
| | | | | | | | | | | | 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.
* | Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-271-1/+1
|/ | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
* Add commented log lines to FetchInventoryDescendents2 path for future use.Justin Clark-Casey (justincc)2011-12-091-3/+9
| | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
* Add test for not found response from GetTexture cap handler.Justin Clark-Casey (justincc)2011-12-051-0/+63
| | | | Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
* Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-3/+3
| | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* For the GetTexture capability, if a data range is requested that covers the ↵Justin Clark-Casey (justincc)2011-12-051-14/+25
| | | | | | | | | | whole asset length, return HTTP PartialContent instead of NotFound NotFound is obviously wrong, and this change stops viewer 3.2.2 (and v probably earlier) complaining in the log about missing textures that are actually present. We still return PartialContent even if the range requested is a superset of the data range as per httpd's behaviour https://issues.apache.org/bugzilla/show_bug.cgi?id=51878 Viewer 3.2.2 and very probably earlier appear happy with this. Whether fixing this NotFound bug has any practical effect apart from resolve viewer log messages is unknown.
* refactor: Separate the upload baked texture handler out from BunchOfCapsJustin Clark-Casey (justincc)2011-12-011-3/+1
|
* Save the default terrain texture UUIDs for a new region instead of leaving ↵Justin Clark-Casey (justincc)2011-09-091-3/+2
| | | | | | | | | | | them as UUID.Zero. Leaving them at UUID.Zero meant that when a viewer 2 logged into a region that had been freshly created, it received UUID.Zero for these textures, and hence display the land as plain white. On a simulator restart, the problem would go away since when the database adapators loaded the new region settings, RegionSettings itself has code to use default textures instead of UUID.Zero. This commit resolves the problem by saving the default texture UUIDs instead of Zero. However, we currently have to do this in a roundabout way by resaving once the RegionSettings have been created by the database for the first time. This needless complexity should be addressed. This change will also have the effect of replacing any existing UUID.Zero terrain textures with the default ones. However, this shouldn't have any effect since the UUID.Zeros were already being replaced in memory with those same UUIDs.
* Comment verbose debug message in GetTextureDiva Canto2011-05-081-1/+1
|
* Fix the GetTexture path to /CAPS/GetTexture for now until we have real ↵Diva Canto2011-05-021-1/+1
| | | | capabilities.
* Refactored the GetMesh module into a handler and a module, to be the same as ↵Diva Canto2011-05-022-0/+426
GetTexture.