aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-09-011-4/+20
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * minor: remove mono compiler warning from LLClientViewJustin Clark-Casey (justincc)2013-08-231-4/+0
| |
| * Don't allow users to attempt to sit on objects in a child region without ↵Justin Clark-Casey (justincc)2013-08-211-0/+20
| | | | | | | | | | | | | | going to that region first. If this is attempted, they get a "Try moving closer. Can't sit on object because it is not in the same region as you." message instead, which is the same as current ll grid. Sitting on ground is okay, since viewer navigates avatar to required region first before sitting.
* | Merge branch 'master' into careminsterMelanie2013-08-173-38/+79
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * Packet headers are not zero-encoded so don't try to zero-decode these in ↵Justin Clark-Casey (justincc)2013-08-161-16/+9
| | | | | | | | | | | | | | | | PacketPool.GetType() Instead adjusts code with that from Packet.BuildHeader(byte[], ref int, ref int):Header in libomv This stops packet decoding failures with agent UUIDs that contain 00 in their earlier parts (e.g. b0b0b0b0-0000-0000-0000-000000000211) Thanks to lkalif for pointing this out.
| * minor: Comment out AvatarPicketSearch caps log message for now, which is ↵Justin Clark-Casey (justincc)2013-08-141-1/+1
| | | | | | | | occuring on every login and entity transfer
| * Add stat clientstack.<scene>.IncomingPacketsOrphanedCount to record ↵Justin Clark-Casey (justincc)2013-08-141-4/+29
| | | | | | | | well-formed packets that were not initial connection packets and could not be associated with a connected viewer.
| * Count any incoming packet that could not be recognized as an LLUDP packet as ↵Justin Clark-Casey (justincc)2013-08-141-21/+44
| | | | | | | | | | | | | | a malformed packet. Record this as stat clientstack.<scene>.IncomingPacketsMalformedCount Used to detect if a simulator is receiving significant junk UDP Decimates the number of packets between which a warning is logged and prints the IP source of the last malformed packet when logging
* | Merge branch 'master' into careminsterMelanie2013-08-131-3/+8
|\ \ | |/
| * minor: Extend warning message when adding trying to add an event for a ↵Justin Clark-Casey (justincc)2013-08-121-3/+8
| | | | | | | | client without a queue to include the event message name.
* | Merge branch 'master' into careminsterMelanie2013-08-114-7/+41
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Merge branch 'TeleportWork'Justin Clark-Casey (justincc)2013-08-094-5/+11
| |\
| | * Fix an issue where under teleport v2 protocol, teleporting from regions in ↵Justin Clark-Casey (justincc)2013-08-084-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an line from A->B->C would not close region A when reaching C The root cause was that v2 was only closing neighbour agents if the root connection also needed a close. However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection. This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports). Also, has not been completely tested yet in scenarios where regions are running on different simulators
| * | * This makes in-world terrain editing smoother, even in MegaRegions. This ↵teravus2013-08-071-3/+30
| |/ | | | | | | change only affects the editing user's experience. Non-editing users will see nothing different from the current 'slow' result. See comments for the thought process and how the issues surrounding terrain editing, cache, bandwidth, threading, terrain patch reliability and throttling were balanced.
* | Merge branch 'master' into careminsterMelanie2013-08-071-0/+12
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * For LLImageManagerTests, make tests execute under synchronous fire and ↵Justin Clark-Casey (justincc)2013-08-051-8/+12
| | | | | | | | | | | | forget conditions. I generally prefer this approach for regression tests because of the complexity of accounting for different threading conditions.
| * Fix the failing TestSendImage. J2K decoding is async.Diva Canto2013-08-031-1/+9
| |
* | Merge branch 'master' into careminsterMelanie2013-08-011-2/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * minor: Add name to debug lludp packet level feedback on consoleJustin Clark-Casey (justincc)2013-08-011-1/+1
| |
| * Try a different approach to slow terrain update by always cycling the loop ↵Justin Clark-Casey (justincc)2013-08-011-1/+2
| | | | | | | | | | | | | | | | immediately if any data was sent, rather than waiting. What I believe is happening is that on initial terrain send, this is done one packet at a time. With WaitOne, the outbound loop has enough time to loop and wait again after the first packet before the second, leading to a slower send. This approach instead does not wait if a packet was just sent but instead loops again, which appears to lead to a quicker send without losing the cpu benefit of not continually looping when there is no outbound data.
| * Revert "Issue: painfully slow terrain loading. The cause is commit ↵Justin Clark-Casey (justincc)2013-08-011-5/+5
| | | | | | | | | | | | d9d995914c5fba00d4ccaf66b899384c8ea3d5eb (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does." This reverts commit 59b461ac0eaae1cc34bb82431106fdf0476037f3.
| * Issue: painfully slow terrain loading. The cause is commit ↵Diva Canto2013-08-011-5/+5
| | | | | | | | d9d995914c5fba00d4ccaf66b899384c8ea3d5eb (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does.
* | Merge branch 'master' into careminsterMelanie2013-08-013-38/+52
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-311-1/+5
| | | | | | | | | | | | | | cap is something other than "localhost". A new interface for handling external caps is supported with an example implemented for Simian. The only linden cap supporting this interface right now is the GetTexture cap.
| * Doing the HG Map / SimulatorFeatures "the right way": moved it to ↵Diva Canto2013-07-301-12/+3
| | | | | | | | | | | | | | HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does). Only HG Visitors get this var, to avoid spamming local users. The config var is now called MapTileURL, to be consistent with the login one, and its being picked up from either [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a bad memory.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-301-11/+28
| |\
| | * minor: Add timeout secs to connection timeout message. Change message to ↵Justin Clark-Casey (justincc)2013-07-291-8/+9
| | | | | | | | | | | | reflect it is a timeout due to no data received rather than an ack issue.
| | * Fix issue just introduced in 8efe4bfc2ed7086e9fdf4812297e6525f955f6ac where ↵Justin Clark-Casey (justincc)2013-07-291-1/+1
| | | | | | | | | | | | I accidentally left in a test line to force very quick client unack
| | * Make "abnormal thread terminations" into "ClientLogoutsDueToNoReceives" and ↵Justin Clark-Casey (justincc)2013-07-291-5/+21
| | | | | | | | | | | | | | | | | | | | | add this to the StatsManager This reflects the actual use of this stat - it hasn't recorded general exceptions for some time. Make the sim extra stats collector draw the data from the stats manager rather than maintaing this data itself.
| * | After talking to lkalif on the IRC: SimulatorFeatures response: renamed the ↵Diva Canto2013-07-301-6/+7
| |/ | | | | | | | | | | OSDMap GridServices to OpenSimExtras, normalized the url keys under it, and moved ExportEnabled to under it too. Melanie: change your viewer code accordingly. Documentation at http://opensimulator.org/wiki/SimulatorFeatures_Extras
* | Merge branch 'master' into careminsterMelanie2013-07-291-54/+16
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-271-2/+2
| | | | | | | | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
| * Slight improvement: no need to delay the removal of the queues in EQ, ↵Diva Canto2013-07-261-8/+0
| | | | | | | | because DisableSimulator is now being sent via UDP
| * This should fix all issues with teleports. One should be able to TP as fast ↵Diva Canto2013-07-251-44/+14
| | | | | | | | | | | | | | | | | | as needed. (Although sometimes Justin's state machine kicks in and doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess things up. But it looks like this commit makes them work right. Here's what's going on: - Child and root agents are only closed after 15 sec, maybe - If the user comes back, they aren't closed, and everything is reused - On the receiving side, clients and scene presences are reused if they already exist - Caps are always recreated (this is where I spent most of my time!). It turns out that, because the agents carry the seeds around, the seed gets the same URL, except for the root agent coming back to a far away region, which gets a new seed (because we don't know what was its seed in the departing region, and we can't send it back to the client when the agent returns there).
* | Merge branch 'master' into careminsterMelanie2013-07-251-0/+79
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs bin/OpenSimDefaults.ini
| * Deleted all [ZZZ] debug messages.Diva Canto2013-07-241-5/+0
| |
| * One more thing to test in order to let CompleteMovement go up the stack.Diva Canto2013-07-241-2/+3
| |
| * Minor adjustment on timings of waits.Diva Canto2013-07-241-4/+19
| |
| * Changed the RegionHandshake packet to the Unknown queue, so that it is sent ↵Diva Canto2013-07-241-1/+1
| | | | | | | | with high priority and hopefully gets to the client before AgentMovementComplete
| * New Teleport protocol (V2), still compatible with V1 and older. (version of ↵Diva Canto2013-07-241-0/+68
| | | | | | | | | | | | | | | | the destination is being checked) In this new protocol, and as committed before, the viewer is not sent EnableSimulator/EstablishChildCommunication for the destination. Instead, it is sent TeleportFinish directly. TeleportFinish, in turn, makes the viewer send a UserCircuitCode packet followed by CompleteMovementIntoRegion packet. These 2 packets tend to occur one after the other almost immediately to the point that when CMIR arrives the client is not even connected yet and that packet is ignored (there might have been some race conditions here before); then the viewer sends CMIR again within 5-8 secs. But the delay between them may be higher in busier regions, which may lead to race conditions. This commit improves the process so there are are no race conditions at the destination. CompleteMovement (triggered by the viewer) waits until Update has been sent from the origin. Update, in turn, waits until there is a *root* scene presence -- so making sure CompleteMovement has run MakeRoot. In other words, there are two threadlets at the destination, one from the viewer and one from the origin region, waiting for each other to do the right thing. That makes it safe to close the agent at the origin upon return of the Update call without having to wait for callback, because we are absolutely sure that the viewer knows it is in th new region. Note also that in the V1 protocol, the destination was getting UseCircuitCode from the viewer twice -- once on EstablishAgentCommunication and then again on TeleportFinish. The second UCC was being ignored, but it shows how we were not following the expected steps...
* | Merge branch 'master' into careminsterMelanie2013-07-245-120/+386
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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
| * Add proper method doc and comments to m_dataPresentEvent (from d9d9959)Justin Clark-Casey (justincc)2013-07-231-2/+13
| |
| * Add clientstack.InboxPacketsCount stat. This records the number of packets ↵Justin Clark-Casey (justincc)2013-07-231-0/+13
| | | | | | | | | | | | waiting to be processed at the second stage (after initial UDP processing) If this consistently increases then this is a problem since it means the simulator is receiving more requests than it can distribute to other parts of the code.
| * Add clientstack.OutgoingUDPSendsCount stat to show number of outbound UDP ↵Justin Clark-Casey (justincc)2013-07-232-3/+22
| | | | | | | | packets sent by a region per second
| * Record raw number of UDP receives as clientstack.IncomingUDPReceivesCountJustin Clark-Casey (justincc)2013-07-232-1/+20
| |
| * Add AverageUDPProcessTime stat to try and get a handle on how long we're ↵Justin Clark-Casey (justincc)2013-07-232-2/+56
| | | | | | | | | | | | | | | | taking on the initial processing of a UDP packet. If we're not receiving packets with multiple threads (m_asyncPacketHandling) then this is critical since it will limit the number of incoming UDP requests that the region can handle and affects packet loss. If m_asyncPacketHandling then this is less critical though a long process will increase the scope for threads to race. This is an experimental stat which may be changed.
| * Added check for user movement specification before discarding an incomingRobert Adams2013-07-222-42/+42
| | | | | | | | | | | | AgentUpdate packet. This fixes the problem with vehicles not moving forward after the first up-arrow. Code to fix a potential exception when using different IClientAPIs.
| * Minor cosmetic changes.Diva Canto2013-07-211-27/+23
| |
| * The quaternion delta was a bit to high, now that the head rotation is out of ↵Diva Canto2013-07-211-1/+1
| | | | | | | | the equation. (head rotation was the problematic one)
| * EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to ↵Diva Canto2013-07-211-23/+4
| | | | | | | | lkalif for telling me how to route the information. The viewer effect is under the distance filter, so only avatars with cameras < 10m away see the beams.