aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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 'avination' into careminsterMelanie2012-08-312-60/+230
|\ \
| * | Sequence inventory descendents requests to reduce inventory server load andMelanie2012-08-301-0/+1
| | | | | | | | | | | | movement lag.
| * | Fix issue with the quit packet being stuck int he queue and a one packet delay.Melanie2012-08-291-2/+8
| | | | | | | | | | | | Also fix semaphore excetion caused by enqueueing while dequque is taking place.
| * | Remove Justin's addition to avoid sending incoming packets to inactive clientsMelanie2012-08-291-9/+9
| | | | | | | | | | | | | | | This also causes the initial AgentUpdate to be rejected because our processing is asynchronous.
| * | Add a queue with two priority levels. This is a drop in replacement forMelanie2012-08-281-2/+111
| | | | | | | | | | | | the BlockingQueue from OMV, but allows two priorities.
| * | Remove debug spamMelanie2012-08-241-2/+2
| | |
| * | Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-241-49/+103
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-233-9/+8
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | 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-202-6/+10
| | | | | | | | | | | | | | | | | | 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.
| * Actually add the moduleMelanie2012-08-141-0/+234
| |
* | Allow updates sent for right pec to go to the clientMelanie2012-08-211-1/+1
| |
* | Make the console output from the reigon console hookableMelanie2012-08-181-0/+7
| |
* | Actually add the moduleMelanie2012-08-141-0/+234
| |
* | Merge branch 'careminster' into avinationMelanie2012-08-142-4/+9
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * \ Merge branch 'master' into careminsterMelanie2012-08-042-4/+9
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵Justin Clark-Casey (justincc)2012-08-032-4/+9
| | | | | | | | | | | | | | | | | | DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket. All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
* | | 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-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
| | |
generated by cgit v1.1 at 2024-10-21 18:45:08 +0000