aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-10-048-50/+139
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ↵Justin Clark-Casey (justincc)2013-09-273-3/+4
| | | | | | | | the code that this is symmetric with CloseAgent()
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-273-6/+6
| | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| * Reinsert client.SceneAgent checks into ↵Justin Clark-Casey (justincc)2013-09-251-11/+26
| | | | | | | | | | | | | | | | LLUDPServer.HandleCompleteMovementIntoRegion() to fix race condition regression in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100) This check is necessary to close a race condition where the CompleteAgentMovement processing could proceed when the UseCircuitCode thread had added the client to the client manager but before the ScenePresence had registered to process the CompleteAgentMovement message. This is most probably why the message appeared to get lost on a proportion of entity transfers. A better long term solution may be to set the IClientAPI.SceneAgent property before the client is added to the manager.
| * Reinsert 200ms sleep accidentally removed in commit 7dbc93c (Wed Sep 18 ↵Justin Clark-Casey (justincc)2013-09-251-2/+2
| | | | | | | | 21:41:51 2013 +0100)
| * Instead of swallowing any socket begin/end receive exceptions, log them for ↵Justin Clark-Casey (justincc)2013-09-251-7/+32
| | | | | | | | | | | | debugging purposes. This may reveal why on some teleports with current code, the UseCircuitCode message gets through but CompleteMovement disappears into the ether.
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-223-0/+6
| | | | | | | | | | | | | | | | | | | | Patch taken from http://opensimulator.org/mantis/view.php?id=4905 originally by Greg C. Fixed to apply to r/23314 commit ba9daf849e7c8db48e7c03e7cdedb77776b2052f (cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
| * Double the time spent waiting for a UseCircuitCode packet in ↵Justin Clark-Casey (justincc)2013-09-181-1/+1
| | | | | | | | | | | | | | | | | | LLUDPServer.HandleCompleteMovementIntoRegion() This is to deal with one aspect of http://opensimulator.org/mantis/view.php?id=6755 With the V2 teleport arrangements, viewers appear to send the single UseCircuitCode and CompleteAgentMovement packets immediately after each other Possibly, on occasion a poor network might drop the initial UseCircuitCode packet and by the time it retries, the CompleteAgementMovement has timed out and the teleport fails. There's no apparant harm in doubling the wait time (most times only one wait will be performed) so trying this.
| * Change logging to provide more information on ↵Justin Clark-Casey (justincc)2013-09-181-10/+39
| | | | | | | | | | | | | | LLUDPServer.HandleCompleteMovementIntoRegion() Add more information on which endpoint sent the packet when we have to wait and if we end up dropping the packet Only check if the client is active - other checks are redundant since they can only failed if IsActve = false
| * Change handling of the FetchInventoryDescendents2 capability configuration ↵Mic Bowman2013-09-111-23/+36
| | | | | | | | | | | | to allow for external handlers.
* | Merge branch 'avination-current' into careminsterMelanie2013-09-162-23/+46
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-081-0/+12
| | |
| * | Add support for simple external CAPS texture servicesroot2013-09-071-19/+31
| | |
* | | Merge branch 'master' into careminsterMelanie2013-09-071-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Fix bug where users teleporting to non-neighbour regions could continue to ↵Justin Clark-Casey (justincc)2013-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | hear chat from their source region for some time after teleport completion. This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat. This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running. This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
* | | 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
generated by cgit v1.1 at 2024-09-18 00:08:08 +0000