aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-0323-304/+1733
|\
| * Merge branch 'avination' into careminsterMelanie2012-11-221-7/+35
| |\
| | * * While this is not producing any problems.. and does help in low bandwidth ↵teravus2012-11-221-7/+35
| | | | | | | | | | | | situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet.
| * | Merge branch 'avination' into careminsterMelanie2012-11-203-18/+88
| |\ \ | | |/
| | * * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-173-18/+88
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| | * Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-1510-823/+164
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| | * Merge master into teravusworkteravus2012-11-1510-164/+823
| | |\
| * | \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-202-72/+409
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| | * | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-092-73/+410
| | | | | | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
| * | | Merge branch 'avination' into careminsterMelanie2012-11-172-14/+183
| |\ \ \ | | |/ /
| | * | This implements the Caps throttler. After some testing, the system seemed ↵teravus2012-11-051-13/+106
| | | | | | | | | | | | | | | | | | | | | | | | to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference. Tested with Two Clients on a region with 1800 textures all visible at once.
| | * | Another step in the chain. Pipe the throttle update to the appropriate ↵teravus2012-11-051-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator. Next step is hooking it up to HasEvents
| | * | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-042-0/+53
| | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
| * | | Merge branch 'master' into careminsterMelanie2012-11-171-0/+1
| |\ \ \
| | * | | Add a first draft mechanism for the IncomingPacketsProcessedStat to show the ↵Justin Clark-Casey (justincc)2012-11-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delta over time. The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling.
| * | | | Merge branch 'master' into careminsterMelanie2012-11-154-104/+206
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * | | Handle Map block requests on a separate thread rather than the main packet ↵Justin Clark-Casey (justincc)2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling thread. This prevents a slow grid information network call from holding up the main packet handling thread. There's no obvious race condition reason for not doing this asynchronously.
| | * | | Do HandleMapLayerRequest on its own thread rather than on the main inbound ↵Justin Clark-Casey (justincc)2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | udp packet handling thread. There's no obvious race condition reason for doing this on the main packet handling thread.
| | * | | Following on from 4f982596, launch map name requests on an async thread from ↵Justin Clark-Casey (justincc)2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLClientView directly. This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
| | * | | Make PacketPool class stats pull stats instead of push stats so they can be ↵Justin Clark-Casey (justincc)2012-11-153-63/+107
| | | | | | | | | | | | | | | | | | | | lifted up into LLUDPServer and be distiguished by scene name
| | * | | Add IncomingPacketsProcessedCount stat for diagnostics.Justin Clark-Casey (justincc)2012-11-152-38/+96
| | | | | | | | | | | | | | | | | | | | Also puts some packet processing counts in a container named after the scene so that stats can be collected from more than one scene.
| * | | | Merge branch 'master' into careminsterMelanie2012-11-152-0/+66
| |\ \ \ \ | | |/ / /
| | * | | Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-142-0/+66
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-11-1311-13/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| | * | | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-1212-12/+12
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-11-122-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| | * | | Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-123-5/+5
| | | | | | | | | | | | | | | | | | | | grepping for remaining uses
| * | | | Merge branch 'master' into careminsterMelanie2012-11-112-102/+102
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| | * | One more module converted: ObjectAdd.Diva Canto2012-11-101-51/+66
| | | |
| | * | One more module: EventQueueGetModule. Also making it non-optional for this dll.Diva Canto2012-11-101-53/+38
| | | |
| * | | Merge branch 'master' into careminsterMelanie2012-10-311-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| | * | Handle UUIDGroupName and ObjectGroup viewer UDP requests asynchronously ↵Justin Clark-Casey (justincc)2012-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than synchronously. This is to avoid the entire scene loop being held up when the group service is slow to respond. There's no obvious reason for these queries to be sync rather than async.
| * | | Merge branch 'master' into careminsterMelanie2012-10-261-3/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| | * | Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Viewer 3 will discard such a message if the chat message owner does not match the avatar. We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages. This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages. This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
| * | | Merge branch 'master' into careminsterMelanie2012-10-233-14/+166
| |\ \ \ | | |/ /
| | * | Make it possible to turn the base UDP object packet pools on and off whilst ↵Justin Clark-Casey (justincc)2012-10-232-38/+131
| | | | | | | | | | | | | | | | | | | | | | | | running via the "debug lludp pool <on|off>" console command. For debug purposes. This does not currently apply to the higher LLUDP packetpool.
| | * | Add object count stats for new IncomingPacket and UDPPacketBuffer pools if ↵Justin Clark-Casey (justincc)2012-10-233-6/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are enabled. Add count stats for existing LLUDP pool. This introduces a pull stat type in addition to the push stat type. A pull stat takes a method on construction which knows how to update the stat on request. In this way, special interfaces for pull stat collection are not necessary.
| * | | Merge branch 'avination' into careminsterMelanie2012-10-182-12/+12
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * | | Merge branch 'master' into careminsterMelanie2012-10-181-15/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
| | * | minor: Remove event method doc from LLClientView that I forgot in the last ↵Justin Clark-Casey (justincc)2012-10-181-15/+0
| | | | | | | | | | | | | | | | commit (1de80c)
| * | | Merge branch 'master' into careminsterMelanie2012-10-181-41/+68
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| | * | Reuse the same AgentUpdateArgs object for each AgentUpdate UDP packet (of ↵Justin Clark-Casey (justincc)2012-10-171-41/+68
| | | | | | | | | | | | | | | | | | | | | | | | which there are 10 a second) rather than constructing a new one every time. We can do this because AgentUpdate packets are handled synchronously.
| * | | Merge branch 'master' into careminsterMelanie2012-10-174-14/+62
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * | Explicitly return only the incoming AgentUpdate packet as this is the only ↵Justin Clark-Casey (justincc)2012-10-173-8/+30
| | | | | | | | | | | | | | | | one we pool atm, rather than attempting to return all incoming packets.
| | * | If RecycleBaseUDPPackets = true, also pool IncomingPackets to reduce memory ↵Justin Clark-Casey (justincc)2012-10-172-2/+30
| | | | | | | | | | | | | | | | churn
| * | | Merge branch 'avination' into careminsterMelanie2012-10-171-2/+2
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-10-171-1/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs
| | * | | minor: Make BasicCircuitTests.SetUp() call overriden base method instead of ↵Justin Clark-Casey (justincc)2012-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | ignoring it.
| * | | | Merge branch 'master' into careminsterMelanie2012-10-172-30/+55
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| | * | | Add optional pool for the UDPPacketBuffer objects that handle all incoming ↵Justin Clark-Casey (justincc)2012-10-162-24/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UDP data. Even when an avatar is standing still, it's sending in a constant stream of AgentUpdate packets that the client creates new UDPPacketBuffer objects to handle. This option pools those objects. This reduces memory churn. Currently off by default. Works but the scope can be expanded.