aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* merge crap gerge branch 'ubitwork' of ↵ubit2012-08-021-16/+15
|\ | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into ubitwork Conflicts: bin/Regions/Regions.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so
| * Merge branch 'master' into careminsterMelanie2012-07-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| | * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-1/+1
| | | | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| * | Merge branch 'avination' into careminsterMelanie2012-07-231-1/+1
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-07-201-15/+14
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * | Prevent race conditions between two threads that call LLClientView.Close() ↵Justin Clark-Casey (justincc)2012-07-191-15/+14
| | | | | | | | | | | | | | | | simultaneously (e.g. ack timeout and an attempt to reconnect)
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-231-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
| |/ / | | | | | | | | | if the client told us it wants to log out in the first place.
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-171-50/+149
|\ \ \ | |/ /
| * | Merge branch 'avination' into careminsterMelanie2012-07-161-8/+63
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ Merge branch 'master' into careminsterMelanie2012-07-131-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * | Stop redundantly passing in the endpoint to the LLClientView constructor.Justin Clark-Casey (justincc)2012-07-121-1/+1
| | | | | | | | | | | | | | | | This can always be retrieved via the LLUDPClient and is so done in various places already.
| * | | Merge branch 'avination' into careminsterMelanie2012-07-061-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-07-051-2/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS ↵Justin Clark-Casey (justincc)2012-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | to reflect what it actually is
| * | | | Merge branch 'master' into careminsterMelanie2012-06-151-4/+4
| |\ \ \ \ | | |/ / /
| | * | | Add region name to UseCircuitCode log messagesJustin Clark-Casey (justincc)2012-06-151-4/+4
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-06-121-7/+36
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * | | Remove accidental timeout left in during earlier debugging. Has been in ↵Justin Clark-Casey (justincc)2012-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | since two commits ago (b099f26)
| | * | | Set IClientAPI.IsActive = false early on client removal due to ack timeout ↵Justin Clark-Casey (justincc)2012-06-121-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than using IsLoggingOut flag. IsActive is more appropriate since unack timeout is not due to voluntary logout. This is in line with operations such as manual kick that do not set the IsLoggingOut flag. It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick).
| | * | | If the simulator closes a root agent due to ack timeout, then send the ↵Justin Clark-Casey (justincc)2012-06-121-2/+20
| | | | | | | | | | | | | | | | | | | | client a kick message with that reason, in case it is somehow still listening.
| * | | | Merge branch 'master' into careminsterMelanie2012-06-091-44/+33
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * | | Instead of retrieving the known client again in LLUDPServer.RemoveClient(), ↵Justin Clark-Casey (justincc)2012-06-081-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check the IsLoggingOut flag instead. This is slightly better thread-race wise
| | * | | If logging a client out due to ack timeout, do this asynchronously rather ↵Justin Clark-Casey (justincc)2012-06-081-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than synchronously on the outgoing packet loop. This is the same async behaviour as normal logouts. This is necessary because the event queue will sleep the thread for 5 seconds on an ack timeout logout as the client isn't around to pick up the final event queue messages.
| | * | | Add regression test for client logout due to ack timeout.Justin Clark-Casey (justincc)2012-06-081-4/+6
| | | | |
| | * | | Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet ↵Justin Clark-Casey (justincc)2012-06-081-8/+1
| | | | | | | | | | | | | | | | | | | | nor client are ever null.
| | * | | Store already retrieve IClientAPI in IncomingPacket structure for later use ↵Justin Clark-Casey (justincc)2012-06-081-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than doing another retrieve on dequeue. Instead of checking whether the client still exists by trying to retrieve again from the client manager, this patch gets it back from IncomingPacket and checks the IClientAPI.IsActive state.
| * | | | Merge branch 'master' into careminsterMelanie2012-06-071-5/+70
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| | * | | Log warning if we try to remove a UDP client that has already been removed.Justin Clark-Casey (justincc)2012-06-071-0/+6
| | | | |
| | * | | Allow the thread watchdog to accept an alarm method that is invoked if the ↵Justin Clark-Casey (justincc)2012-06-071-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout is breached. This alarm can then invoke this to log extra information. This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
| * | | | Merge branch 'master' into careminsterMelanie2012-06-061-3/+15
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| | * | | Mantis 4597 AgentPaused packet is ignored.Talun2012-06-051-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The packet was actually being handled but not acted on. This change extends the default timeout for paused clients to 5 minutes and makes both the paused and non-paused timeout periods configurable.
| * | | | Merge branch 'master' into careminsterMelanie2012-04-271-2/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * | | Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-261-1/+3
| | | | | | | | | | | | | | | | | | | | problem resolution.
| | * | | minor: Add region name to dropped inbound packet messageJustin Clark-Casey (justincc)2012-04-261-1/+3
| | | | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-161-1/+0
|\ \ \ \ \
| * | | | | backkick gitUbitUmarov2012-07-151-1/+0
| | | | | |
* | | | | | merge fixubit2012-07-161-15/+0
| | | | | |
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-161-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | just a kick gitUbitUmarov2012-07-151-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-161-23/+34
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | | Remove instrumentation and fix the message delivery issueMelanie2012-07-151-24/+28
| | | | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-161-2/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | | Testing changes and instrumentationMelanie2012-07-151-3/+20
| | | | |
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-151-0/+38
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | | Save packets received while the client is added and replay them later.Melanie2012-07-151-0/+34
| | | | |
| * | | | Revert "Experimentally handle UseCircuitCode synchrnonously"Melanie2012-07-151-2/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit e3fa73da96f5612da52d140425f1633494d6edef.
| * | | | Experimentally handle UseCircuitCode synchrnonouslyMelanie2012-07-151-1/+2
| | |_|/ | |/| |
* | | | to stashubit2012-07-151-2/+2
|/ / /
* | | coment out some of previus debug messaged before forgetting about them...UbitUmarov2012-06-221-2/+2
| | |
generated by cgit v1.1 at 2025-01-20 05:01:43 +0000