aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2013-01-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cached Bakes.
| * | | | | | | | | | | | 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 'avination' into careminsterMelanie2012-11-251-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | * Fix a null ref error in ↵teravus2012-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
| * | | | | | | | | | | | | 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-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-152-0/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-09-274-11/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures get into inventory again. Both features under config control. Have direct warnings to client, including a final one on upload complete since i see nothing. problems: textures don't showup in inventory til relog, also issues with permitions. A few more changes
| | * | | | | | | | | | | | | | report asset upload errors the right awayUbitUmarov2012-09-222-0/+12
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of someUbitUmarov2012-09-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more needed fields in request
| * | | | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-09-165-107/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | report mesh upload costs ( fake values)UbitUmarov2012-09-111-1/+22
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-111-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still)
| * | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-09-071-7/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-07-131-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.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
* | | | | | | | | | | | | | | | | | WARNING: massive refactor to follow libomv's latest changes regarding ↵Diva Canto2015-08-082-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum. This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter. All tests pass, but fingers crossed!
* | | | | | | | | | | | | | | | | | Eliminated several warningsOren Hurvitz2015-07-311-2/+5
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | FetchInventoryDescendents2: Signal to the viewer that folder with UUID.Zero ↵Diva Canto2015-06-232-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is a bad folder. Don't even go to the backend to ask for it, because that will likely kill the sim. Apparently Firestorm requests folder Zero quite often.
* | | | | | | | | | | | | | | | | | Mantis #7603 -- bad folders in inventory could produce null pointer ↵Diva Canto2015-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception. Thanks for the line numbers in the exception trace.
* | | | | | | | | | | | | | | | | | Mantis #7567. Once again, avoiding prefetching linked items within linked ↵Diva Canto2015-06-041-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders. Also fixing the inventory connector GetMultipleItems, so that if everything is in the cache, it returns successfully rather than unsuccessfully.
* | | | | | | | | | | | | | | | | | Mantis #7567: added an 8-sec expiring item cache to the inventory network ↵Diva Canto2015-06-034-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connector. This fixed the problem on my local test grid and generally made things faster. This cache has been needed for a while... there are many parts in the code where the sim gets an item multiple times in a short amount of time (rezzing attachs and objects, for example). Other minor changes: - added the scene as a parameter to the constructor od FetchInvDescHandler, so that I could see in which scene the handler was being called - brought linked items in linked folders back to being prefetched
* | | | | | | | | | | | | | | | | | I suspect the viewer doesn't need the target of linked items inside linked ↵Diva Canto2015-06-021-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders to go in the reply of the original request. At least my tests indicate that. Pushing this out, so that others who use linked folders a lot more can verify.
* | | | | | | | | | | | | | | | | | New unit tests for FetchInventory2 cap.Diva Canto2015-06-021-0/+170
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Mantis #7567. One of the reported log messages showed this:Diva Canto2015-06-021-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09:38:40 - [LOGHTTP]: Slow handling of 15572 POST /CAPS/b12c7e98-8261-4953-b7d1-1c414c9893fc FetchInventory2 8acfbca3-13b5-434f-898c-5f4bbe8a76ff from 92.237.199.112:60083 took 62391ms FetchInventory itself wasn't taking advantage of the new inventory API. This commit fixes that.
* | | | | | | | | | | | | | | | | | Mantis #7594: putting things as they were before regarding duplicate ↵Diva Canto2015-06-012-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removal. Also added test to check that duplicates are being removed. The test passes. I have no idea how duplicates would not be removed, as reported in the mantis.
* | | | | | | | | | | | | | | | | | Mantis #7594. Fixing the broken code I just introduced.Diva Canto2015-06-011-1/+4
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | More on mantis #7594, this a=time addressing the reported exception, which ↵Diva Canto2015-06-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seems to be a separate issue from the duplicate folders.
* | | | | | | | | | | | | | | | | | Mantis #7594. This should be functionally equivalent to what it was, but ↵Diva Canto2015-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | just in case mono has a bug in List<T>.Find, here is the Linq equivalent of distinct-ness.
* | | | | | | | | | | | | | | | | | Improved comments on fetch inventory testsDiva Canto2015-05-101-1/+12
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Added unit tests for FetchInventoryDescendents ↵Diva Canto2015-05-104-0/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://wiki.secondlife.com/wiki/Linden_Lab_Official:Inventory_API#Fetch_Inventory_Descendents Also, consolidated the location of the files that handle inventory capabilities.
* | | | | | | | | | | | | | | | | | Fix mantis #7054: AO in Firestorm and Kokua stopped loading after new ↵Diva Canto2015-05-091-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inventory code in place. Cause: # of descendants was wrong.
* | | | | | | | | | | | | | | | | | Another major overhaul of inventory downloading, this time pertaining to ↵Diva Canto2015-05-081-102/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inventory links. Added yet another function to IInventoryService to get multiple items at once, so that fetching collections of linked items is done once per folder instead of once per item.
* | | | | | | | | | | | | | | | | | Restore handling of bad folders. I'm not entirely sure this is part of the ↵Diva Canto2015-05-081-9/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | protocol -- I don't see it here: http://wiki.secondlife.com/wiki/Linden_Lab_Official:Inventory_API#Fetch_inventory_descendents But who knows!
* | | | | | | | | | | | | | | | | | Apparently Firestorm sometimes sends duplicate folder ids on the same ↵Diva Canto2015-05-081-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request (see http://opensimulator.org/mantis/view.php?id=7054#c28297). This was throwing the new inventory download code off. Firestorm also sends requests for folder UUID.Zero, which doesn't exist, but doesn't cause any problems either -- it just fails. I'm leaving the warning message for now, just to keep an eye on which folders can't be found, but may remove it in the future.
* | | | | | | | | | | | | | | | | | Additional debug message to help diagnose a warning message and exception ↵Diva Canto2015-05-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related to previous commit. See http://opensimulator.org/mantis/view.php?id=7054#c28282