aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-271-1/+7
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-1/+7
| | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero
* | Merge branch 'avination' into careminsterMelanie2012-09-101-5/+52
|\ \ | |/
| * llClientView: try to have only one thread per client processingUbitUmarov2012-09-081-4/+49
| | | | | | | | RegionHandleRequests. (code assumes packet handle is called async as it is not)
| * a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-041-1/+3
| | | | | | | | flight. FS 4.2.2 does not.
* | Merge branch 'master' into careminsterMelanie2012-08-311-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Replace SendBannedUserList with Avination's version. Untested in core. Not ↵Melanie2012-08-311-25/+32
| | | | | | | | | | | | even test compiled.
* | | Merge branch 'master' into careminsterMelanie2012-08-231-7/+6
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-5/+9
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
| * Fix llDialog responses so that they can be heard throughout the region. This ↵Melanie2012-08-191-1/+1
| | | | | | | | now conforms to the behaviour in SL.
* | Allow updates sent for right pec to go to the clientMelanie2012-08-211-1/+1
| |
* | Remove another superflouous IsActive setMelanie2012-08-031-2/+0
| |
* | Remove a merge artefaci in IsActive handling and restore commented out ↵Melanie2012-08-031-2/+1
| | | | | | | | correct one
* | clientview IsActive use is broken. Suspend it's use keeping it true ( toUbitUmarov2012-08-031-3/+3
| | | | | | | | review later)
* | 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-201-3/+7
|\ \
| * | Fix slow loading of task inventoryMelanie2012-07-191-3/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-201-15/+44
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Make LLClientView instant message handling asynchronous rather than ↵Justin Clark-Casey (justincc)2012-07-191-1/+1
| | | | | | | | | | | | | | | | | | synchronous to prevent long operations from holding up all inbound packet processing. Giving a large folder from one avatar to another was causing a long delay when handled synchronously, since it took some time to retrieve the necessary data from the inventory service. Handling this asynchronously instead stops this delay from disrupting all avatars in the scene. This has been shown in OSGrid. I see no reason for not handling all IM messages asynchronously, just as incoming chat is handled asynchronously, so this has been switched for all instant messages. Thanks to Nebadon for testing this change out.
| * Prevent race conditions between two threads that call LLClientView.Close() ↵Justin Clark-Casey (justincc)2012-07-191-15/+43
| | | | | | | | simultaneously (e.g. ack timeout and an attempt to reconnect)
* | Merge branch 'master' into careminsterMelanie2012-07-131-29/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop redundantly passing in the endpoint to the LLClientView constructor.Justin Clark-Casey (justincc)2012-07-121-4/+1
| | | | | | | | This can always be retrieved via the LLUDPClient and is so done in various places already.
| * Remove IClientIPEndpoint client interface for now.Justin Clark-Casey (justincc)2012-07-121-20/+1
| | | | | | | | | | This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor. Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
| * Remove IClientAPI.GetClientEP() in favour of existing identical ↵Justin Clark-Casey (justincc)2012-07-121-5/+0
| | | | | | | | IClientAPI.RemoteEndpoint.
| * In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove ↵Justin Clark-Casey (justincc)2012-06-251-1/+32
| | | | | | | | | | | | | | | | | | attachment before changing properties for correct inventory serialization. Serialization of attachments requires IsAttachment = false so that correct positions are serialized instead of avatar position. However, doing this when a hud is still attached allows race conditions with update threads, resulting in hud artifacts on other viewers. This change sets SOG.IsDeleted before serialization changes take place (IsDeleted itself is not a serialized property). LLClientView then screens out any deleted SOGs before sending updates to viewers.
| * Fix very recent regression in 917d753 where I put the ++updatesThisCall ↵Justin Clark-Casey (justincc)2012-06-141-2/+2
| | | | | | | | | | | | outside the batching part of ProcessEntityUpdates() This stopped any batching happening and since this method is called periodically updates were sent very slowly
| * If we're going to discard a terse update block because it's now someone ↵Justin Clark-Casey (justincc)2012-06-141-2/+4
| | | | | | | | else's hud, then don't still add it to the list of blocks for the update message.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-141-4/+29
| |\
| | * Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-141-4/+29
| | | | | | | | | | | | up the sound pipeline in the viewer.
| * | Fix a race condition where an object update for a hud could be sent to ↵Justin Clark-Casey (justincc)2012-06-141-3/+24
| |/ | | | | | | | | | | | | non-owner avatars if the hud was attached directly from within the region. If this happens, then the non-owners would see unremovable huds that they did not own until relog, and sometimes even beyond that. This was due to a race between the entity update and the attachment code when moving an object from within scene to a hud.
* | Merge branch 'avination' into careminsterMelanie2012-07-061-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem ↵UbitUmarov2012-06-291-0/+3
| | | | | | | | | | | | prim related only. This does fix the wrong viewer side move of a avatar in prim edition mode (anv mantis 854), with no apparent side effects .. may need more testing
| * | more debugUbitUmarov2012-06-221-0/+3
| | |
| * | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-071-4/+29
| | | | | | | | | | | | up the sound pipeline in the viewer.
* | | Merge branch 'master' into careminsterMelanie2012-06-141-6/+3
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: refactor part of LLClientView.ProcessEntityUpdates() to remove ↵Justin Clark-Casey (justincc)2012-06-131-5/+7
| | | | | | | | | | | | duplicate code
| * | Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-131-4/+0
| | |
| * | Add ObjectUpdate as one of the packets that can be screened out when setting ↵Justin Clark-Casey (justincc)2012-06-131-1/+2
| | | | | | | | | | | | debug packet level
* | | Merge branch 'master' into careminsterMelanie2012-06-121-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already ↵Justin Clark-Casey (justincc)2012-06-121-2/+2
| | | | | | | | | | | | available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
| * | 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.
* | | 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 'avination' into careminsterMelanie2012-06-021-19/+19
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Remove the kill record. Core has removed it long ago and it really does more ↵Melanie2012-06-011-19/+19
| | | | | | | | | | | | harm than good these days
* | | Merge branch 'avination' into careminsterMelanie2012-05-311-18/+32
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fix the log standing attach-from-world bug.Melanie2012-05-301-18/+32
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-05-171-2/+8
|\ \ \ | |/ /
| * | udp transfer: make number packets estimation coerent with number actually ↵UbitUmarov2012-05-171-2/+8
| | | | | | | | | | | | sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
* | | Merge branch 'avination' into careminsterMelanie2012-05-131-1/+21
|\ \ \ | |/ /