aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Remove redundant and annoyingly modal message box in upload processing.Melanie2012-10-181-11/+11
| | |
| * | Allow the console to be used by gods as well as region owners.Melanie2012-10-171-1/+1
| | |
* | | 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
|\ \ \ | | |/ | |/|
| * | Make texture sedning use only two threads to make things less harsh on bandwidthMelanie2012-10-141-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.
* | | Merge branch 'master' into careminsterMelanie2012-10-162-31/+129
|\ \ \ | |/ /
| * | Make it possible to separate start and stop lludp packet processing from the ↵Justin Clark-Casey (justincc)2012-10-162-31/+129
| | | | | | | | | | | | | | | | | | | | | console for debug processes. This is controlled via the "debug lludp start <in|out|all>" and "debug lludp stop <in|out|all>" region console commands. The command "debug lludp status" will show current status.
* | | Merge branch 'master' into careminsterMelanie2012-10-164-11/+24
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
| * | minor: Add missing newlines and spacing to help for "debug eq" console commandJustin Clark-Casey (justincc)2012-10-161-4/+4
| | |
| * | minor: comment out "Registered seed capability" message for "Received SEED ↵Justin Clark-Casey (justincc)2012-10-161-4/+5
| | | | | | | | | | | | | | | | | | caps request" message for now. I think this is more useful right now since it tells us if the viewer requested a seed caps at all in various scenarios (such as when teleporting to a new region).
| * | minor: Comment out the region console caps message for now.Justin Clark-Casey (justincc)2012-10-161-1/+1
| | |
| * | minor: Fix and elaborate on log information printed when an unrecognized ↵Justin Clark-Casey (justincc)2012-10-131-2/+14
| | | | | | | | | | | | estate method is received from the client.
* | | Merge branch 'master' into careminsterMelanie2012-10-125-37/+88
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: Use && instead of & when deciding whether to print ↵Justin Clark-Casey (justincc)2012-10-121-1/+1
| | | | | | | | | | | | | | | | | | Improve/ObjectUpdate packet out messages when debug is turned on. Practical effect is probably none.
| * | minor: Fix bug in categorization of blocks reused stat from packetpoolJustin Clark-Casey (justincc)2012-10-121-1/+1
| | |
| * | Add AgentUpdate to PacketPool. This is the most common inbound packet from ↵Justin Clark-Casey (justincc)2012-10-123-5/+28
| | | | | | | | | | | | viewers.
| * | Fix percentage stats to multiply by 100. Adjust container name for ↵Justin Clark-Casey (justincc)2012-10-121-2/+2
| | | | | | | | | | | | packetpool stats.
| * | Enable reuse of data blocks for ImprovedTerseObjectUpdate using existing ↵Justin Clark-Casey (justincc)2012-10-121-1/+3
| | | | | | | | | | | | Packetpool code.
| * | Fix packetpool for ImprovedTerseObjectUpdate packets.Justin Clark-Casey (justincc)2012-10-113-5/+15
| | | | | | | | | | | | | | | These were neither being returned or in many places reused. Getting packets from a pool rather than deallocating and reallocating reduces memory churn which in turn reduces garbage collection time and frequency.
| * | Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-111-8/+35
| | | | | | | | | | | | | | | | | | This allows different categories of stats to be shown, with options to list categories or show all stats. Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism. This commit also adds percentage stats for packets and blocks reused from the packet pool.
| * | Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to ↵Justin Clark-Casey (justincc)2012-10-102-18/+9
| | | | | | | | | | | | | | | | | | prevent an inactive connection being left behind if the user closes the viewer whilst the connection is being established. This should remove the need to run the console command "kick user --force" when these connections are left around.
| * | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵Justin Clark-Casey (justincc)2012-10-091-0/+1
| | | | | | | | | | | | easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
* | | Merge branch 'master' into careminsterMelanie2012-10-073-1/+260
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bucket slot for RLV, notify the viewer about inventory folder updates. The viewer would not see the folder move without this, either on accept or decline. This commit also updates the TaskInventoryOffered message to better conform with the data LL uses Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail, message is just folder name in single quotes, message is not timestamped. However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side. Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
| * | Read PacketPool config in LLUDPServer with other config params rather than ↵Justin Clark-Casey (justincc)2012-10-051-0/+9
| | | | | | | | | | | | | | | | | | | | | in Scene. This is to resolve previous build break. This unnecessarily but harmlessly reads and sets the parameter multiple times - scene was doing the same thing.
generated by cgit v1.1 at 2024-12-26 08:09:50 +0000