aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2013-07-245-97/+76
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post ↵Diva Canto2013-07-181-2/+9
| | | | | | | | | | | | | | | | | | requests timeout in 60 secs. There's plenty of room for improvement in handling the EQs. Some other time...
| * | Reverting the reverts I did yesterday. cpu-branch has now beenDiva Canto2013-07-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | successfully tested, and I'm merging back those changes, which proved to be good. Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"" This reverts commit fa2370b32ee57a07f27501152c3c705a883b13d8.
| * | Revert "Cleared up much confusion in PollServiceRequestManager. Here's the ↵Diva Canto2013-07-171-5/+3
| | | | | | | | | | | | | | | | | | history:" This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
| * | Cleared up much confusion in PollServiceRequestManager. Here's the history:Diva Canto2013-07-171-3/+5
| | | | | | | | | | | | | | | | | | When Melanie added the web fetch inventory throttle to core, she made the long poll requests (EQs) effectively be handled on an active loop. All those requests, if they existed, were being constantly dequeued, checked for events (which most often they didn't have), and requeued again. This was an active loop thread on a 100ms cycle! This fixes the issue. Now the inventory requests, if they aren't ready to be served, are placed directly back in the queue, but the long poll requests aren't placed there until there are events ready to be sent or timeout has been reached. This puts the LongPollServiceWatcherThread back to 1sec cycle, as it was before.
| * | 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
| * | Simplify EventQueue cap setup so that it is also stat monitored.Justin Clark-Casey (justincc)2013-07-161-45/+29
| | | | | | | | | | | | Curiously, the number of requests received is always one greater than that shown as handled - needs investigation
| * | 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-153-48/+33
| |/ / | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2013-07-131-16/+28
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
| * | Changed UploadBakedTextureModule so that it uses the same pattern as the ↵Diva Canto2013-07-121-8/+27
| | | | | | | | | | | | others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before.
* | | Merge branch 'master' into careminsterMelanie2013-07-134-4/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | For stat purposes, add names to capability request handlers where these were ↵Justin Clark-Casey (justincc)2013-07-082-3/+10
| | | | | | | | | | | | not set
| * | 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
| * | 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
| | |
* | | 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
| * | 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 'avination-current' into careminsterMelanie2013-06-111-10/+13
|\ \ \ | | |/ | |/|
| * | Explicitly set uploaded mesh object permsMelanie2013-06-101-10/+13
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-081-0/+29
|\ \ \ | | |/ | |/|
| * | 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
| | | |
| * | | Supply proper type information for the various types of requestsMelanie2013-06-071-0/+1
| | | |
| * | | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-072-4/+4
| |/ /
| * | Port Avination's inventory send throttlingMelanie2013-06-051-52/+213
| | |
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-062-2/+34
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Let the event queue do lees work - expire every 40s as per Teravus instead ↵Melanie2013-05-221-1/+1
| | | | | | | | | | | | of every seconds - whoever put that in....
| * | Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
| * | Send 503 when throttling texturesMelanie2013-04-251-1/+33
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-121-1/+0
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Delete debug messageDiva Canto2013-05-101-1/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-081-0/+140
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Added AvatarPickerSearch capability handler.Diva Canto2013-05-071-0/+140
| | |
* | | Merge branch 'master' into careminsterMelanie2013-05-011-1/+12
|\ \ \ | |/ / | | / | |/ |/| Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-1/+12
| | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
* | Merge branch 'master' into careminsterMelanie2013-03-281-1/+24
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
| * minor: Fix usage error message for "debug eq" console commandJustin Clark-Casey (justincc)2013-03-281-1/+1
| |
| * Add "show eq" console command to show numbers of messages in agent event queues.Justin Clark-Casey (justincc)2013-03-281-0/+23
| | | | | | | | For debugging purposes.
* | Merge branch 'master' into careminsterMelanie2013-03-261-0/+6
|\ \ | |/
| * Implement a pref to turn on the simulator ExportSupported feature entry.Melanie2013-03-261-0/+6
| | | | | | | | | | | | This tells the viewer to enable the UI for export permissions. WARNING: If your inventory store contains invalid flags data, this will result in items becoming exportable! Don't turn this on in production until it's complete!
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-262-2/+4
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-4/+5
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' into careminsterMelanie2013-03-131-1/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * minor: Remove mono compiler warnings in EventQueueTestsJustin Clark-Casey (justincc)2013-03-111-1/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-03-051-5/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * Fix issue in the mesh upload flag module where the ID of the last agent to ↵Justin Clark-Casey (justincc)2013-03-041-6/+6
| | | | | | | | | | | | request the capability was always used instead of the original requesting agent for each cap. Should address http://opensimulator.org/mantis/view.php?id=6556
* | Merge branch 'avination' into careminsterMelanie2013-03-033-2/+9
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
generated by cgit v1.1 at 2025-03-10 18:13:42 +0000