aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Inventory (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Framework/Servers/ServerBase.cs OpenSim/Framework/VersionInfo.cs OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs OpenSim/Region/PhysicsModules/Ode/OdeScene.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/GatekeeperService.cs OpenSim/Services/Interfaces/IAvatarService.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * Mantis #7720: AssetXferUploader was setting AssetID to UUID.Zero. Before ↵Diva Canto2015-09-111-1/+9
| | | | | | | | that wouldn't matter (item would be a terminal object) but with the introduction of the item cache, it matters, because the object in the cache was being modified to have AssetID=UUID.Zero. Also keeping the item cache consistent when item properties change.
* | put back diva's cache with her recent fix but also avoid duplicated ↵UbitUmarov2015-09-111-1/+8
| | | | | | | | InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it
* | inventory messUbitUmarov2015-09-111-66/+219
| |
* | remove diva's inventory cache since it seems to cause mantis 7720, broken ↵UbitUmarov2015-09-111-219/+66
|/ | | | items UUID. Guess it doesn't cover all paths
* Deleted OpenSim.Framework.Communications. Moved its two remaining files to ↵Diva Canto2015-09-041-1/+1
| | | | OpenSim.Framework.
* WARNING: massive refactor to follow libomv's latest changes regarding ↵Diva Canto2015-08-081-1/+1
| | | | | | | 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!
* More on mantis #7567. Two things:Diva Canto2015-06-051-2/+4
| | | | | - Increase the inventory cache timeout to 20 secs, so that the items will still be there when they are needed by the sim for rezzing - Before rezzing attachs, make a call to GetMultipleItems so to fetch them all at the same time
* Mantis #7600. The warning message was not a symptom of a problem, it was ↵Diva Canto2015-06-041-9/+11
| | | | just that the HG client was trying to fetch folders that aren't in the Suitcase, so that fails. This should make the warning message go away in that situation. (fetching those folders will still fail, because they aren't available over HG)
* Making the inventory cache static, so that there's less timers.Diva Canto2015-06-041-1/+1
|
* Mantis #7567. Once again, avoiding prefetching linked items within linked ↵Diva Canto2015-06-041-1/+9
| | | | 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-031-6/+31
| | | | | | | | 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
* Added inventory tests to Robust.Tests.Diva Canto2015-05-111-1/+5
|
* Another major overhaul of inventory downloading, this time pertaining to ↵Diva Canto2015-05-081-0/+37
| | | | 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.
* I shouldn't write code this early in the morning... Fixing a 'duh' on ↵Diva Canto2015-05-081-1/+1
| | | | previous commit.
* Additional debug message to help diagnose a warning message and exception ↵Diva Canto2015-05-081-0/+1
| | | | | | related to previous commit. See http://opensimulator.org/mantis/view.php?id=7054#c28282
* Major change in the way inventory is downloaded: added a method throughout ↵Diva Canto2015-05-071-1/+80
| | | | IIventoryService that fetches sets of folders at once. Also added folder id in the InventoryCollection data structure, so that we don't need to go to inventory server again just for that. This reduces the chatter between sims and inventory server by... a lot. On my tests, this reduces initial inventory download down to 30% of what it currently is.
* Move the inventory request lock introduced in git master a58152bd to ↵Justin Clark-Casey (justincc)2014-08-091-7/+4
| | | | | | | HGInventoryBroker to preserve that behaviour there but allow 2 simultaneous inv requests (chiefly WebFetch) rather than 1 This lock serialized all requests and made the inventory throttling in WebFetch redundant. By moving this lock, two simultaneous requests may now take place which may help with http://opensimulator.org/mantis/view.php?id=7054
* Add inventory.<url>.RequestsMade stat.Justin Clark-Casey (justincc)2014-07-261-0/+21
| | | | | | This gives a count of all requests made to the remote inventory service. This is finer grained than inventory.httpfetch.ProcessedFetchInventoryRequests since such a request can be comprised of many individual inv service calls. In addition, this will count requests that don't go through the HTTP inventory fetch (e.g. HG, archiving, etc.)
* Add undocumented RemoteRequestTimeout seconds parameter to xinventory requestsJustin Clark-Casey (justincc)2014-07-251-4/+14
| | | | | This is for testing purposes (chiefly http://opensimulator.org/mantis/view.php?id=7054) so many not be permanent Setting this will change the xinventory request timeout from the simulator from the default 100 seconds
* Adds optional HTTP Basic Authentication to Robust service connectors.Diva Canto2014-05-231-2/+3
|
* Improved HTTP loggingOren Hurvitz2014-04-291-1/+6
|
* Removed GetUserInventory(). It wasn't being used, and was creating warnings ↵Oren Hurvitz2014-04-231-40/+1
| | | | because it's Obsolete.
* Make XInventoryServicesConnector properly handle a RESULT = false return for ↵Justin Clark-Casey (justincc)2013-06-131-68/+56
| | | | | | methods where this contains failure rather than throwing an exception. Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
* Change exception log messages in XInventoryService connector to error rather ↵Justin Clark-Casey (justincc)2012-08-011-9/+8
| | | | | | than debug, since these signal real problems. Also outputs full exception instead of just the message to aid diagnostics.
* If we're fetching active gestures via the XInventoryServiceConnector, then ↵Justin Clark-Casey (justincc)2012-07-301-1/+1
| | | | properly look at the ITEMS dictionary already returned rather than the level above this.
* Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵Justin Clark-Casey (justincc)2012-05-091-0/+0
| | | | | | | | the actual class names. This is usually because the file name was singular (*Service*) but the class name was plural (*Services*). This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector. This does not affect existing configuration since the files are being renamed rather than the classes.
* Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-061-8/+39
|
* More on inventory transfer hold ups:Diva Canto2012-03-091-3/+7
| | | | | | - Added an inventory cache for caching root and system folders - Synchronized the remote inventory connector, so that all the remote inventory calls are serialized This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
* Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.Diva Canto2011-04-251-6/+4
|
* Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵Diva Canto2011-04-121-1/+0
| | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
* Added an additional debug message, and removed a bunch of files that weren't ↵Diva Canto2011-02-044-1253/+0
| | | | being used anymore -- the old RemotsInventory connectors stuff.
* Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-231-1/+8
|
* Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-211-0/+3
| | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255).
* Formatting cleanup.Jeff Ames2010-09-121-1/+1
|
* * XInventory fairly tested, including for HG. Almost ready to switch.Diva Canto2010-04-301-65/+54
| | | | * Removed a few buglets and added better exception handling.
* XInventory connector/handler showing signs of life. Tested, but needs more ↵Diva Canto2010-04-271-50/+78
| | | | testing.
* RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵Diva Canto2010-04-261-0/+29
| | | | default configs yet.
* Formatting cleanup. Add copyright notices.Jeff Ames2010-03-101-1/+1
|
* * Typo fixesJohn Hurliman2010-03-091-1/+1
| | | | * Performance improvement in the expensive GenerateClientFlags()
* Finished implementing the XInventory connector. Untested.Diva Canto2010-02-071-10/+10
|
* The first 2 handlers for the XInventory system.Melanie2010-01-081-2/+2
|
* Complete the XInventoryConnector. Flesh out the skeleton for theMelanie2010-01-061-2/+48
| | | | XInventoryInConnector
* Add the XInventoryServicesConnector, a new inventory connector without the cruftMelanie2010-01-051-13/+185
| | | | | of the old one that makes inventory crash on folder creation. This is just the connector part, the handler is still ont he todo list.
* Add the unfinished XInventoryConnector. Intermediate commit, will NOT compile!Melanie2010-01-051-0/+317
|
* minor: Correct some inventory corrector log messages and add more ↵Justin Clark-Casey (justincc)2009-11-181-19/+20
| | | | identifying detail
* minor: correct error messages when queryfolder failsJustin Clark-Casey (justincc)2009-11-181-4/+1
|
* * Fixes http://opensimulator.org/mantis/view.php?id=4225Diva Canto2009-10-121-0/+1
| | | | | * Fixes http://opensimulator.org/mantis/view.php?id=3959 * Allows for viewing inventory textures outside home grid
* * Removed verbose debug messageDiva Canto2009-10-061-7/+0
| | | | | * Restored HG inventory access which had been lost upon adding a 3rd argument to inventory and asset server handlers * Fixed a stupid bug in the InventoryConnector which was making move items do things twice
* Remove the methods for full inventory fetch from the connector. Remove testsMelanie2009-09-171-35/+1
| | | | for the old, removed asset handlers