aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-2420-242/+437
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * BulletSim: add position resetting for stationary avatars so they don'tRobert Adams2013-07-182-5/+20
| | | | | | | | | | | | move around when standing on a stationary object. Create proper linkage between BSCharacter and its actor by generating a UpdatedProperties event the same way BSPrim does.
| * 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...
| * try Hacking in an AutoResetEvent to control the outgoing UDP loop instead of ↵Justin Clark-Casey (justincc)2013-07-182-2/+28
| | | | | | | | | | | | a continuous loop with sleeps. Does appear to have a cpu impact but may need further tweaking
| * 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.
| * Added MinPoolThreads to ini [Startup] section to control SmartThreadPool.Dan Lake2013-07-181-1/+3
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-171-2/+3
| |\
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-07-177-28/+98
| | |\
| | * | command line kick user now uses exact name match instead of substring search ↵Dan Lake2013-07-171-2/+3
| | | | | | | | | | | | | | | | to avoid kicking the wrong user or multiple wrong users.
| * | | Revert "Cleared up much confusion in PollServiceRequestManager. Here's the ↵Diva Canto2013-07-171-5/+3
| | |/ | |/| | | | | | | | | | | | | history:" This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-172-6/+10
| |\ \
| | * | BulletSim: fix small bug where everything looked like it was collidingRobert Adams2013-07-172-6/+10
| | | | | | | | | | | | | | | | before the first simulator step.
| * | | 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.
| * | 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-163-11/+36
| | | | | | | | | | | | 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-163-6/+12
| |\ \ | | |/
| | * Attachments module only registers when enabled. This enables alternative ↵Dan Lake2013-07-163-6/+12
| | | | | | | | | | | | 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
| |
| * Added IServiceThrottleModule.csDiva Canto2013-07-161-0/+11
| |
| * 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
| |
| * 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-1512-95/+109
| |\
| | * Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt"Diva Canto2013-07-151-1/+1
| | | | | | | | | | | | This reverts commit b060ce96d93a33298b59392210af4d336e0d171b.
| | * Guard against null refDiva Canto2013-07-151-1/+2
| | |
| | * Puts RequestImage (UDP) back to asyn -- CPU spike huntDiva Canto2013-07-151-1/+1
| | |
| | * Revert the revertDiva Canto2013-07-151-0/+2
| | | | | | | | | | | | | | | | | | Revert "Trying to hunt the CPU spikes recently experienced." This reverts commit ac73e702935dd4607c13aaec3095940fba7932ca.
| | * Protect against null requestsDiva Canto2013-07-152-12/+16
| | |
| | * Trying to hunt the CPU spikes recently experienced.Diva Canto2013-07-151-2/+0
| | | | | | | | | | | | | | | | | | Revert "Comment out old inbound UDP throttling hack. This would cause the UDP" This reverts commit 38e6da5522a53c7f65eac64ae7b0af929afb1ae6.
| * | Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-155-69/+110
| | | | | | | | | | | | | | | | | | | | | 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-185-13/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-133-26/+61
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
| * | | Merge branch 'master' into careminsterMelanie2013-07-1357-828/+1732
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1865-936/+1848
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| * | | Let's go easy on authenticating ChildAgentUpdates, otherwise this will be ↵Diva Canto2013-07-141-7/+5
| | | | | | | | | | | | | | | | chaotic while ppl are using different versions of opensim. Warning only, but no enforcement.
| * | | Fix broken tests -- the test setup was wrong... sigh.Diva Canto2013-07-141-0/+1
| | | |
| * | | Authenticate ChildAgentUpdate too.Diva Canto2013-07-142-16/+29
| | | |
| * | | Change the auth token to be the user's sessionid.Diva Canto2013-07-143-6/+6
| | | |
| * | | And this fixes the other failing tests. Justin, the thread pool is not being ↵Diva Canto2013-07-131-2/+0
| | | | | | | | | | | | | | | | initialized in the tests!
| * | | This should fix the failing test.Diva Canto2013-07-131-2/+1
| | | |
| * | | Deleted a line too manyDiva Canto2013-07-131-0/+3
| | | |
| * | | Guard against unauthorized agent deletes.Diva Canto2013-07-136-22/+42
| | | |
generated by cgit v1.1 at 2024-12-13 23:48:59 +0000