aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-282-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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-252-2/+2
| | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
* | Merge branch 'master' into careminsterMelanie2012-07-251-1/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Extend region console "show queues" command to show already collected time ↵Justin Clark-Casey (justincc)2012-07-241-1/+2
| | | | | | | | since last packeted received by the simulator from a viewer.
* | Merge branch 'avination' into careminsterMelanie2012-07-231-1/+1
|\ \
| * | Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
| | | | | | | | | | | | if the client told us it wants to log out in the first place.
* | | 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-202-30/+58
|\ \ \ | |/ / |/| / | |/ | | | | | | 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-192-30/+57
| | | | | | | | simultaneously (e.g. ack timeout and an attempt to reconnect)
* | Merge branch 'avination' into careminsterMelanie2012-07-161-8/+63
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Remove instrumentation and fix the message delivery issueMelanie2012-07-151-24/+28
| | |
| * | Testing changes and instrumentationMelanie2012-07-151-3/+20
| | |
| * | 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
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-132-30/+3
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Stop redundantly passing in the endpoint to the LLClientView constructor.Justin Clark-Casey (justincc)2012-07-122-5/+2
| | | | | | | | | | | | 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.
* | | Merge branch 'avination' into careminsterMelanie2012-07-063-2/+11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-041-1/+1
| | | | | | | | | | | | it's timeout
| * | 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
| * | coment out some of previus debug messaged before forgetting about them...UbitUmarov2012-06-221-2/+2
| | |
| * | more debugUbitUmarov2012-06-221-0/+3
| | |
| * | i more debugUbitUmarov2012-06-221-1/+1
| | |
| * | add a temp debug messageUbitUmarov2012-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-07-051-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS ↵Justin Clark-Casey (justincc)2012-07-041-2/+2
| | | | | | | | | | | | to reflect what it actually is
* | | Merge branch 'master' into careminsterMelanie2012-06-291-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Add IScene.Name for code clarity to replace the RegionInfo.RegionName used ↵Justin Clark-Casey (justincc)2012-06-291-2/+1
| | | | | | | | | | | | in many, many log messages.
| * | 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.
* | | Merge branch 'master' into careminsterMelanie2012-06-152-5/+5
|\ \ \ | |/ /
| * | Add region name to UseCircuitCode log messagesJustin Clark-Casey (justincc)2012-06-151-4/+4
| | |
| * | Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-151-1/+1
| | | | | | | | | | | | scattering them over other categories
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+10
|\ \ \ | |/ /
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ↵Justin Clark-Casey (justincc)2012-06-151-1/+10
| | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance
| * | 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 'master' into careminsterMelanie2012-06-141-1/+0
|\ \ \ | |/ /
| * | minor: remove unnecessary IsAttachment = false setting for new object in ↵Justin Clark-Casey (justincc)2012-06-141-1/+0
| | | | | | | | | | | | UploadObjectAssetModule, property always starts as false
* | | 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
generated by cgit v1.1 at 2024-12-22 23:56:36 +0000