aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-12-072-11/+23
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * minor: Use enums for setting inv/asset types on data upload rather than ↵Justin Clark-Casey (justincc)2013-12-061-7/+7
| | | | | | | | magic numbers
| * Properly set InventoryType.Snapshot when a snapshot is uploadedJustin Clark-Casey (justincc)2013-12-061-0/+4
| | | | | | | | | | Resolves http://opensimulator.org/mantis/view.php?id=6857 This prevents the inventory service complaining later about an attempt to change an invariant
| * Fix regression where mouse look flight direction no longer worked by zeroing ↵Justin Clark-Casey (justincc)2013-12-051-1/+24
| | | | | | | | | | | | | | x/y rot before sending agent updates, instead of before any agent update processing It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook. Doing this in the terse send so that we preserve mouselook rotation information
| * Still send CameraEyeOffset in UDP SendSitReponse even if at offset is ↵Justin Clark-Casey (justincc)2013-11-291-5/+2
| | | | | | | | Vector3.Zero
| * Merge branch 'link-sitting'Justin Clark-Casey (justincc)2013-11-291-1/+17
| |\
| | * Fix stand positions rather than having the stand jump to the root prim.Justin Clark-Casey (justincc)2013-11-271-0/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2013-11-232-0/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * | Revert "Fix issue where sitting on non-root linked prims would send camera ↵Justin Clark-Casey (justincc)2013-11-231-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | to wrong position in third-person and mouselook" Reverting to place on separate branch This reverts commit ff4e7de7769b7eaa1b4fd3917e59f362b708226a.
| * | Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset ↵Justin Clark-Casey (justincc)2013-11-231-2/+5
| |/ | | | | | | | | | | is Vector3.Zero" This reverts commit 9bdd3dc7de46507b490a2eae5160123a28133d63.
| * Still send CameraEyeOffset in UDP SendSitReponse even if at offset is ↵Justin Clark-Casey (justincc)2013-11-231-5/+2
| | | | | | | | | | | | Vector3.Zero As far as I can see it's valid to change the eye offset even if you aren't changing the at target.
| * Fix issue where sitting on non-root linked prims would send camera to wrong ↵Justin Clark-Casey (justincc)2013-11-231-1/+7
| | | | | | | | | | | | position in third-person and mouselook We now specify sits as offsets from the root prim, as the viewer expects.
| * Added sending (for now hard-coded) sim isze in SendMapBlockSplit()Latif Khalifa2013-11-061-0/+6
| |
| * Add IncomingPacketsResentCount clientstack statisticsJustin Clark-Casey (justincc)2013-11-061-0/+23
| | | | | | | | | | This records how many packets were indicated to be resends by clients Not 100% reliable since clients can lie about resends, but usually would indicate if clients are not receiving UDP acks at all or in a manner they consider timely.
* | Merge branch 'master' into careminsterMelanie2013-11-084-49/+123
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Start counting resent packets in the places that I missed when the stat was ↵Justin Clark-Casey (justincc)2013-10-312-0/+8
| | | | | | | | first added a few commits ago
| * minor: remove mono compiler warnings in AvatarPickerSearchModule and ↵Justin Clark-Casey (justincc)2013-10-312-7/+3
| | | | | | | | UploadBakedTextureModule
| * Add OutgoingPacketsResentCount clientstack stat.Justin Clark-Casey (justincc)2013-10-312-1/+32
| | | | | | | | | | | | This allows one to monitor the total number of messages resent to clients over time. A constantly increasing stat may indicate a general server network or overloading issue if a fairly high proportion of packets sent A smaller constantly increasing stat may indicate a problem with a particular client-server connection, would need to check "show queues" in this case.
| * minor: Add commented out code for apparent passing of texture IDs in ↵Justin Clark-Casey (justincc)2013-10-241-0/+26
| | | | | | | | | | | | | | ObjectProperties UDP replies to viewer Not yet shown that this is used or resolves a bug where not all textures appear on objects with an "XML with textures" upload from singularity 1.8.3 Proper texture entries are actually present and appear properly on relog, but not on select from viewer until at least one face texture is changed.
| * Comment out LLUDPServer.BroadcastPacket() to reduce code complexity. ↵Justin Clark-Casey (justincc)2013-10-241-38/+38
| | | | | | | | Appears to be a never used method.
| * Only set the data present event if we actually queued an outoing packet (not ↵Justin Clark-Casey (justincc)2013-10-241-4/+17
| | | | | | | | if we sent immediately)
* | Merge branch 'master' into careminsterMelanie2013-10-062-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-042-2/+2
| |
* | 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
| |\ \