aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' into careminsterMelanie2012-06-094-133/+133
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * | | Stop sending a DisableSimulator packet in LLClientView.Close(), which is a ↵Justin Clark-Casey (justincc)2012-06-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | duplicate for child agents and unnecessary for root agents. Close() already calls Scene.RemoveClient() which sends the right eq or udp DisableSimulator message to child agents.
| | * | | 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-082-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-083-91/+103
| | | | |
| | * | | 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-082-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-061-4/+29
| | | | | | | | | | | | | | | | | | | | up the sound pipeline in the viewer.
| * | | | 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 'avination' into careminsterMelanie2012-06-021-19/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-311-18/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-191-39/+61
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| | * | | | | Fix build break. Comment out EQG deregister/register logging.Justin Clark-Casey (justincc)2012-05-181-10/+10
| | | | | | |
| | * | | | | Add level 2 debug eq logging which logs event queue polls.Justin Clark-Casey (justincc)2012-05-181-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor: eq message logging into common method.
| | * | | | | refactor: move EventQueueGet path generation into common method. Rename ↵Justin Clark-Casey (justincc)2012-05-181-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use.
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-05-171-2/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-05-131-1/+21
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-102-6/+9
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-092-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
| * | | | | | | | Merge branch 'avination' into careminsterMelanie2012-05-081-4/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-0512-80/+138
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * | | | | | | | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-0312-80/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
| * | | | | | | | | Merge branch 'master' into careminsterMelanie2012-05-022-2/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| | * | | | | | | | Add regression test for teleporting between neighbouring regions on the same ↵Justin Clark-Casey (justincc)2012-05-012-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simulator This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true. Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
| | * | | | | | | | Revert "Revert "Implement bulk inventory update over CAPS (not recursive by ↵Justin Clark-Casey (justincc)2012-04-271-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | design,"" This reverts commit a90b0e302c110068cec0ee7109e796d2d5fdab4d. Sorry, accidentally reverted this completely by mistake, reverting the revert.
| | * | | | | | | | Revert "Implement bulk inventory update over CAPS (not recursive by design,"Justin Clark-Casey (justincc)2012-04-271-47/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6e7f13a72d4e43f8ca564247e0b56bf5706bbdb1.
| * | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-275-6/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * | | | | | | | Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-273-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
| | * | | | | | | | 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 more detail to unauthorized caps client messageJustin Clark-Casey (justincc)2012-04-261-1/+4
| | | | | | | | | |
| | * | | | | | | | 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
|/ / / / / / / /
* | | | | | | | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's timeout
generated by cgit v1.1 at 2024-12-27 01:01:41 +0000