aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-09-164-428/+400
|\ | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-141-44/+179
| | | | | | | | at any time and to drop requests for avatars n longer in the scene
| * Allow some more connections to try to ease lag.Melanie2012-09-141-1/+3
| |
| * Add a logger so the prior commit will workMelanie2012-09-121-0/+3
| |
| * Stop expiry timer when upload is complete. Log if timeout is reached.Melanie2012-09-121-0/+2
| |
| * Add a timer to time out upload caps handlers that are not used.Melanie2012-09-121-0/+12
| |
| * Add a missing brace, remove a useless temp variable, enable charging.Melanie2012-09-111-6/+3
| |
| * report mesh upload costs ( fake values)UbitUmarov2012-09-111-2/+46
| |
| * let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-111-0/+1
| | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still)
| * Removing the variable prica handler again. It's never called, was misnamed andMelanie2012-09-111-332/+0
| | | | | | | | probably never worked past the mesh beta.
| * Re-add the module and fix a typoMelanie2012-09-111-0/+332
| |
| * Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePriceMelanie2012-09-111-332/+0
| | | | | | | | which is the name actually used in viewer code.
| * Add cost calculation suppor tto the VariablePrice one as wellMelanie2012-09-112-9/+44
| |
| * Revert "Remove the unused NewFileAgentInventoryVariablePrice module."Melanie2012-09-111-0/+296
| | | | | | | | | | | | It's actually used. This reverts commit 94a8e5572b1529190a174f29f866b65e7b2ccc0e.
| * Add the option to have variable costing for uploadsMelanie2012-09-111-7/+44
| |
| * Remove the unused NewFileAgentInventoryVariablePrice module.Melanie2012-09-111-296/+0
| |
| * Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-111-81/+117
| | | | | | | | leverage the Poll Service without blocking it's workers.
* | Merge branch 'avination' into careminsterMelanie2012-09-103-23/+87
|\ \ | |/
| * Remove commented codeMelanie2012-09-101-11/+0
| |
| * webFetchInventory: change control event to simple flag, adjust lockingUbitUmarov2012-09-101-11/+32
| |
| * 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)
| * bug fixUbitUmarov2012-09-041-4/+6
| |
| * a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-042-2/+9
| | | | | | | | 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 '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
|\ \
generated by cgit v1.1 at 2024-12-19 03:19:04 +0000