aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-242-7/+18
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess ↵Justin Clark-Casey (justincc)2013-07-231-2/+2
| | | | | | | | what looks like a very significant reducing in GUN occurrances
| * Don't touch the Current Outfit folder also on coming back homeDiva Canto2013-07-231-1/+9
| |
| * In renaming the folders for hypergriding, don't rename the Current Outfit ↵Diva Canto2013-07-231-1/+1
| | | | | | | | folder. The viewer doesn't like that.
| * Don't post Link asset types back to the home gridDiva Canto2013-07-231-3/+6
| |
* | Merge branch 'master' into careminsterMelanie2013-07-245-125/+270
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Removed the MapItems thread. Redirected the map items requests to the ↵Diva Canto2013-07-162-9/+45
| | | | | | | | services throttle thread. Didn't change anything in how that processor is implemented, for better or for worse.
| * Improvements to the ServiceThrottleModule: added a category and an itemid to ↵Diva Canto2013-07-162-10/+27
| | | | | | | | the interface, so that duplicate requests aren't enqueued more than once.
| * UserManagementModule: in the continuation, call the method that also looks ↵Diva Canto2013-07-161-2/+2
| | | | | | | | up the cache, because the resource may be here in the meantime
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-161-2/+4
| |\
| | * Attachments module only registers when enabled. This enables alternative ↵Dan Lake2013-07-161-2/+4
| | | | | | | | | | | | attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.
| * | Added config var to fiddle with the Interval for the service throttle threadDiva Canto2013-07-161-1/+4
| |/
| * Deleted a couple of verbose messagesDiva Canto2013-07-162-4/+2
| |
| * Changed the name to ServiceThrottle/ServiceThrottleModule in order to ↵Diva Canto2013-07-161-0/+0
| | | | | | | | reflect its more generic nature.
| * Eliminated the UserManagement/UserManagementModule throttle thread. Made the ↵Diva Canto2013-07-162-189/+148
| | | | | | | | other one generic, taking any continuation.
| * In the pursuit of using less CPU: now trying to avoid blocking queues ↵Diva Canto2013-07-162-15/+120
| | | | | | | | altogether. Instead, this uses a timer. No sure if it's better or worse, but worth the try.
| * Actually use DoubleQueue in UserManagement/UserManagementModuleDiva Canto2013-07-161-1/+1
| |
| * High CPU hunt: try a different blocking queue, DoubleQueueDiva Canto2013-07-162-1/+3
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-156-64/+33
| |\
| | * Protect against null requestsDiva Canto2013-07-152-12/+16
| | |
| * | Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-152-21/+77
| | | | | | | | | | | | | | | | | | | | | 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' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-07-181-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-07-1320-109/+788
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'master' into careminsterMelanie2013-07-1823-196/+824
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Cleanup old hg sessions (older than 2 days)Diva Canto2013-07-141-2/+5
| | |
| * | Change the auth token to be the user's sessionid.Diva Canto2013-07-141-3/+3
| | |
| * | Guard against unauthorized agent deletes.Diva Canto2013-07-133-12/+12
| | |
| * | Deleted GET agent all around. Not used.Diva Canto2013-07-132-38/+0
| | |
| * | That didn't fix the problem.Diva Canto2013-07-131-1/+4
| | | | | | | | | | | | | | | | | | Revert "Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4." This reverts commit 682537738008746f0aca22954902f3a4dfbdc95f.
| * | Trying to reduce CPU usage on logins and TPs: trying radical elimination of ↵Diva Canto2013-07-131-4/+1
| |/ | | | | | | all FireAndForgets throughout CompleteMovement. There were 4.
| * minor: remove some regression test logging switches accidentally left ↵Justin Clark-Casey (justincc)2013-07-111-1/+1
| | | | | | | | uncommented.
| * minor: Take out unnecessary clumsy sleep at the end of regression ↵Justin Clark-Casey (justincc)2013-07-111-3/+0
| | | | | | | | | | | | Test404Response(). This wasn't actually necessary in the end but was accidentally left in.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-111-7/+5
| |\
| | * Changed the UserProfileModule so that it's less greedy in terms of thread usage.Diva Canto2013-07-111-7/+5
| | |
| * | Fix regression where llHTTPRequests which did not get an OK response ↵Justin Clark-Casey (justincc)2013-07-112-40/+238
| |/ | | | | | | | | | | | | | | returned 499 and the exception message in the http_response event rather than the actual response code and body. This was a regression since commit 831e4c3 (Thu Apr 4 00:36:15 2013) This commit also adds a regression test for this case, though this currently only works with Mono This aims to address http://opensimulator.org/mantis/view.php?id=6704
| * Revert "minor: remove some mono compiler warnings in UserProfileModule"Robert Adams2013-07-091-13/+16
| | | | | | | | | | | | | | Revert until we understand why all the calls to GetUserProfileServerURI were also commented out. This reverts commit 5f58b9b5526c401e039d27b8c92603ff02421fb8.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-095-72/+329
| |\
| | * minor: remove some mono compiler warnings in UserProfileModuleJustin Clark-Casey (justincc)2013-07-091-16/+13
| | |
| | * For stat purposes, add names to capability request handlers where these were ↵Justin Clark-Casey (justincc)2013-07-081-3/+3
| | | | | | | | | | | | not set
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-088-52/+102
| | |\
| | * | Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-083-6/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Make dictionary read/write locking consistent in CapabilitiesModule, rename ↵Justin Clark-Casey (justincc)2013-07-081-48/+82
| | | | | | | | | | | | | | | | two dictionary fields to standard m_ format
| * | | Put guards on a bunch of exception-inducing code, as seen in logs from load ↵Diva Canto2013-07-093-4/+9
| | |/ | |/| | | | | | | test.
| * | Placed a throttle on UserManagementModule for name lookups. Singularity ↵Diva Canto2013-07-082-11/+57
| | | | | | | | | | | | apparently is flooding the sims with name requests.
| * | Revert "WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT"Diva Canto2013-07-061-3/+1
| | | | | | | | | | | | This reverts commit 9b75d757241e87408c50b1f92996bf667960c348.
| * | Some more fixes on strange behaviors of Unknown User, esp. related to large ↵Diva Canto2013-07-062-16/+16
| | | | | | | | | | | | messy inventories and esp. related to kokua
| * | MORE DEBUG. DON"T USE THIS.Diva Canto2013-07-061-3/+3
| | |
| * | WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMITDiva Canto2013-07-061-1/+3
| | |
| * | Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to ↵Diva Canto2013-07-055-25/+29
| |/ | | | | | | be less dependent on a Scene.
| * Update thread watchdog on GridServiceRequestThread periodically and turn off ↵Justin Clark-Casey (justincc)2013-07-061-1/+3
| | | | | | | | | | | | alarming Unfortunately, alarm can spuriously go off if the thread blocks for a long time on an empty queue.
generated by cgit v1.1 at 2025-01-25 09:57:24 +0000