aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* fix the queue type in useUbitUmarov2015-12-091-7/+8
|
* change threading on GetTexture and getMesh and WebFetch Modules.UbitUmarov2015-11-271-30/+38
|
* remove some duplicate using statementsUbitUmarov2015-11-211-1/+1
|
* try to better merge avn and os fetchinventory and fetchinvdescendentsUbitUmarov2015-09-121-2/+2
|
* inventory mess return to the state before divas cache issueUbitUmarov2015-09-111-29/+116
|
* change to avn fecthinventory and webfecth.. codeUbitUmarov2015-09-111-116/+29
|
* at last we can login and see objects ( friends is dead and disable inUbitUmarov2015-09-031-1/+2
| | | | scenepresence)
* seems to compile ( tests comented out)UbitUmarov2015-09-021-4/+0
|
* bad merge?UbitUmarov2015-09-011-3/+9
|\
| * Merge branch 'master' into careminsterMelanie2013-10-041-22/+35
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ Merge branch 'master' into careminsterMelanie2013-07-241-35/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-07-181-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-06-181-6/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-081-0/+29
| |\ \ \ \ \
| * | | | | | Make a viewer sent XML error prettierMelanie2013-03-031-0/+4
| | | | | | |
| * | | | | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SPMelanie2013-02-061-7/+70
| | | | | | |
| * | | | | | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * | | | | | | just remove the damm thingUbitUmarov2012-09-261-1/+1
| | | | | | | |
| * | | | | | | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | control flag to false
| * | | | | | | more changes to PollServiceUbitUmarov2012-09-261-0/+1
| | | | | | | |
| * | | | | | | do the same to webFecthInvDescModuleUbitUmarov2012-09-251-33/+25
| | | | | | | |
| * | | | | | | Protect the responses map with a lock. Also remove ugly "this." type ofMelanie2012-09-231-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | member notation.
| * | | | | | | Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-111-81/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leverage the Poll Service without blocking it's workers.
| * | | | | | | Remove commented codeMelanie2012-09-101-11/+0
| | | | | | | |
| * | | | | | | webFetchInventory: change control event to simple flag, adjust lockingUbitUmarov2012-09-101-11/+32
| | | | | | | |
| * | | | | | | Remove debug spamMelanie2012-08-241-2/+2
| | | | | | | |
| * | | | | | | Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-241-49/+103
| | | | | | | |
* | | | | | | | Bug fix in inventory fetching: sometimes the caps request comes before there ↵Diva Canto2015-06-171-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is a scene presence, and that's ok.
* | | | | | | | Mantis #7567: added an 8-sec expiring item cache to the inventory network ↵Diva Canto2015-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Major change in the way inventory is downloaded: added a method throughout ↵Diva Canto2015-05-071-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Attempt at fixing mantis #7054. The two inventory threads are stepping on ↵Diva Canto2015-05-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | each other's feet. This needs real-world testing, as I'm not sure of all the consequences of reducing the number of worker threads to 1.
* | | | | | | | And finally renamed the classes themselves.Diva Canto2015-01-131-2/+2
| | | | | | | |
* | | | | | | | refactor: Move methods to start a monitored thread, start work in its own ↵Justin Clark-Casey (justincc)2014-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread and run work in the jobengine from Watchdog to a WorkManager class. This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management. Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget. Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
* | | | | | | | If processing a queued request fails up to the top of the stack, log the ↵Justin Clark-Casey (justincc)2014-06-161-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception and move to the next request rather than terminate the simulator.
* | | | | | | | rename prefix of ↵Justin Clark-Casey (justincc)2014-03-211-34/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scene-inventory.<scene-name>.ProcessedFetchInventoryRequests and QueuedFetchInventoryRequests to inventory.httpfetch.* Actual inventory processing is done with a single set of static structures rather than per scene.
* | | | | | | | minor: Put ProcessedFetchInventoryRequests and QueuedFetchInventoryRequests ↵Justin Clark-Casey (justincc)2014-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in stats category "scene-inventory" instead of "scene" To distinguish from general scene stats
* | | | | | | | Add scene.<scene-name>.ProcessedFetchInventoryRequestsJustin Clark-Casey (justincc)2014-03-181-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shows the number of requests that have been processed. These have not necessarily been sent back to the request since this is done separately by the PollServiceRequestManager
* | | | | | | | Add scene.<scene-name>.QueuedFetchInventoryRequests statJustin Clark-Casey (justincc)2014-03-181-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to aid in detecting whether there are fetch inventory requests remaining to be processed.
* | | | | | | | Add regression test for http inventory fetch.Justin Clark-Casey (justincc)2014-03-171-7/+36
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
* | | | | | | Change handling of the FetchInventoryDescendents2 capability configuration ↵Mic Bowman2013-09-111-23/+36
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to allow for external handlers.
* | | | | | revert last commit which seems to conflict with DoubleQueue internals. The ↵dahlia2013-07-161-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc
* | | | | | add locking to internal queue in WebFetchInvDescModule; lack of which caused ↵dahlia2013-07-161-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | a random crash in a load test yesterday
* | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-151-2/+3
|\ \ \ \ \ \
| * | | | | | Guard against null refDiva Canto2013-07-151-1/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-151-35/+31
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handlers. This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding. Other refactoring was required to get logic into the right places to support this.
* | | | | Get InventoryWorkerThreads to update watchdog on processing requestsJustin Clark-Casey (justincc)2013-07-061-0/+2
| | | | |
* | | | | minor: remove mono compiler warnings in WebFetchInvDescModuleJustin Clark-Casey (justincc)2013-06-171-3/+2
| |_|_|/ |/| | |
* | | | Don't try to abort worker threads in WebFetchInvDescModule if module was not ↵Justin Clark-Casey (justincc)2013-06-141-6/+4
| |_|/ |/| | | | | | | | | | | | | | enabled. This also moves the abort to RemoveRegion() rather than a destructor.
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-071-0/+29
|\ \ \
| * | | Put the configuration back in FetchInventoryDesc2 cap.Diva Canto2013-06-071-0/+29
| | | |