aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-291-3/+10
| | | | XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
* * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-1/+1
| | | | Cached Bakes.
* * Fix a null ref error in ↵teravus2012-11-241-0/+3
| | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
* Merge branch 'avination' into careminsterMelanie2012-11-201-1/+20
|\
| * * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-1/+20
| | | | | | | | * Last step is to flip the throttle distribution.
| * Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-151-16/+2
| | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * Merge master into teravusworkteravus2012-11-151-2/+16
| |\
* | \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-5/+135
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| * | * Fixes mesh loading issues in last commit.teravus2012-11-151-0/+9
| | |
| * | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-091-5/+126
| | | | | | | | | | | | * 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 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 'master' into careminsterMelanie2012-11-151-0/+33
|\ \ \ | |_|/ |/| |
| * | Added a few more AssemblyInfos. (Plus added the one in OptionalModules, ↵Diva Canto2012-11-131-0/+33
| | | | | | | | | | | | which had been forgotten.)
| * | 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.
* | | 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
| * 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.
* | 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
* | If a link points to a non-existing item in FetchInventory caps, then don't ↵Justin Clark-Casey (justincc)2012-06-291-1/+2
| | | | | | | | try to add it to the return data rather than suffering an exception later on
* | As with LLSDInventoryItem from commit 01a2b0b, send type values in ↵Justin Clark-Casey (justincc)2012-06-201-6/+2
| | | | | | | | | | | | LLSDInventoryFolder for inventory CAPs as integers rather than strings. Should also resolve some issues with exceptions being thrown in some inventory fetches.
* | 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.
* | Fix build break whree accidentally did inv.Folders rather than ↵Justin Clark-Casey (justincc)2012-06-021-1/+1
| | | | | | | | inv.Folders.Count in a minor change.
* | minor: tidy up some commentsJustin Clark-Casey (justincc)2012-06-021-4/+2
| |
* | Fix various issues with http inventoryJustin Clark-Casey (justincc)2012-06-022-74/+81
| | | | | | | | | | | | | | | | 1) The return messages were being wrongly populated with the names of asset, inventory and sale types when their corresponding integers should have been used instead. 2) Folders with links were including the linked items in the descendents figure, when only the links should be included. 3) Links and linked items in link folders were not being included in the return data, and not in the correct order. Now that these issues have been addressed, outfits and attachments appear to work consistently when HTTP inventory is enabled (as is now the default).
* | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-037-17/+25
| | | | | | | | | | | | 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.
* Guard against null inventory contents.Diva Canto2012-04-061-2/+2
|
* Implement the FetchInventory2 capability. This accompanies the existing ↵Justin Clark-Casey (justincc)2012-01-063-1/+219
| | | | | | | | | | FetchInventoryDescendents2 capability. Not yet enabled by default. You can enable this by setting Cap_FetchInventory2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini Enabling both FetchInventory2 and FetchInventoryDescendents2 improves the situation with properly fetching attachments and hud objects Probably because viewers are never expecting the odd situation where FetchInventoryDescendents2 is present but not FetchInventory2 However, for some reason attachments and hud objects occasionally fail to appear, though their status is correct in inventory For attachments, focussing on the avatar makes them appear. Hud objects have to be reattached.
* Adding commented out log messages and some minor formatting for future bug ↵Justin Clark-Casey (justincc)2012-01-021-71/+77
| | | | hunting. No functional changes.
* Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-2/+2
| | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* Add commented log lines to FetchInventoryDescendents2 path for future use.Justin Clark-Casey (justincc)2011-12-092-4/+93
| | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
* Revert "Revert "Stop performing the asset save part of baked texture ↵Justin Clark-Casey (justincc)2011-12-081-5/+9
| | | | | | | | uploading on the UploadBakedTexture cap asynchronously."" This turned out not to be the upload texture issue. This reverts commit 8721841fc3944ce0cdf5ce76297e73f9ed269751.
* Stop accidentally setting up the UploadTexture caps handler with the same ↵Justin Clark-Casey (justincc)2011-12-061-2/+0
| | | | | | | | url for all users This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures. This hopefully resolves the recent UploadTexture LLSD problems This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
* Revert "Stop performing the asset save part of baked texture uploading on ↵Justin Clark-Casey (justincc)2011-12-061-9/+5
| | | | | | | | | the UploadBakedTexture cap asynchronously." This is a possible cause of the dramatic upswing in "Unable to upload... No handler registered for LLSD requests..." Needs more investigation. This reverts commit 1854c52ea3c60d0a47f9793a7f5ec405e15489ca.
* 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-053-5/+5
| | | | | | | | 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.
* Stop performing the asset save part of baked texture uploading on the ↵Justin Clark-Casey (justincc)2011-12-011-5/+9
| | | | | | | | | UploadBakedTexture cap asynchronously. This prevents a possible race condition where the client would be told all baked textures had updated before they were in the asset service. The client would then trigger a set appearance which, after a delay, would send the avatar appearance out to other clients. The race condition seems unlikely because of this delay but it's still possible. Might help with grey avatar appearances.
* refactor: Separate the upload baked texture handler out from BunchOfCapsJustin Clark-Casey (justincc)2011-12-012-3/+180
|
* Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().Justin Clark-Casey (justincc)2011-11-261-0/+13
| | | | This has been handled by WebFetchInvDescHandler.Fetch() for some time.
* Stop locking the requests coming in to WebFetchInvDecHandler.Justin Clark-Casey (justincc)2011-11-261-8/+8
| | | | There's no technical reason for this as the methods are thread safe. However, it might have served to slow down requests.
* Resolve error where an unknown asset type would cause the fetch inventory ↵Justin Clark-Casey (justincc)2011-11-251-40/+43
| | | | | | descendents cap to fail. Introduced just a few commits ago in 0688861
* Implement the FetchInventoryDescendents2 capability using the same code as ↵Justin Clark-Casey (justincc)2011-11-251-1/+1
| | | | | | WebFetchInventoryDescendents. Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
* Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() ↵Justin Clark-Casey (justincc)2011-11-251-2/+3
| | | | conversion rather than the arrays in TaskInventoryItem