aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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.
| * | | | 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.
| | * | | refactor: Move OpenSim.Framework.PacketPool to ↵Justin Clark-Casey (justincc)2012-10-051-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSim.Region.Clientstack.Linden.UDP This is to allow it to use OpenSim.Framework.Monitoring in the future. This is also a better location since the packet pool is linden udp specific
| * | | | Merge branch 'avination' into careminsterMelanie2012-09-277-304/+1378
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-09-164-428/+400
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-09-161-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| | * | | | | Added unit tests for multi-region OARsOren Hurvitz2012-09-141-1/+1
| | | | | | |
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-09-103-23/+87
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| | | | | | | | |
* | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-11-023-14/+14
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Make texture sedning use only two threads to make things less harsh on bandwidthMelanie2012-10-141-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-263-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | just remove the damm thingUbitUmarov2012-09-263-3/+3
| | | | | | |
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-11/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-262-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | control flag to false
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-1/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | more changes to PollServiceUbitUmarov2012-09-262-1/+7
| | | | | | |
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-253-67/+62
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | missed changeUbitUmarov2012-09-251-1/+2
| | | | | | |