aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-09-012-3/+28
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * minor: Correct typo on "debug stats record start" messageJustin Clark-Casey (justincc)2013-08-231-1/+1
| |
| * Make it possible to disconnected a specified number of bots via the pCampbot ↵Justin Clark-Casey (justincc)2013-08-191-2/+27
| | | | | | | | | | | | | | console command "disconnect [<n>]" Bots disconnected are ascending from last in numeric order. Temporarily no way to reconnect bots.
* | Merge branch 'master' into careminsterMelanie2013-08-171-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * remove mono compiler warnings from PollServiceRequestManagerJustin Clark-Casey (justincc)2013-08-171-4/+2
| |
| * minor: remove mono compiler warning in StatsManagerJustin Clark-Casey (justincc)2013-08-171-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-08-118-152/+363
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Stats treaking. Update ToOSDMap for Stat and PercentageStat to returnRobert Adams2013-08-104-150/+235
| | | | | | | | | | all the various numbers that have been added to the console output. Break out EventHistogram from CounterStat.
| * Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini.Robert Adams2013-08-081-0/+6
| | | | | | | | | | Add 'callback' query parameter to managed stats return to return function form of JSON data.
| * Add a JSON web fetch of the statististics managed by StatsManager.Robert Adams2013-08-081-0/+31
| | | | | | | | | | | | | | | | | | | | Disabled by default. Enable by setting [Startup]ManagedStatsRemoteFetchURI="Something" and thereafter "http://ServerHTTPPort/Something/" will return all the managed stats (equivilent to "show stats all" console command). Accepts queries "cat=", "cont=" and "stat=" to specify statistic category, container and statistic names. The special name "all" is the default and returns all values in that group.
| * minor: Remove console lines at bottom of FakeParcelIDTests() regression test ↵Justin Clark-Casey (justincc)2013-08-081-2/+0
| | | | | | | | that were accidentally left in
| * Fixed error in BuildFakeParcelID() which was detected by regression tests.Kevin Cozens2013-08-081-2/+2
| |
| * Added regression tests for the routines related to fake parcel IDs.Kevin Cozens2013-08-081-0/+84
| |
| * Additional regression tests for the location routines in Location.csKevin Cozens2013-08-081-0/+7
| |
* | Merge branch 'master' into careminsterMelanie2013-08-079-20/+725
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: add some method doc to ScenePresence fields used for entity transfer, ↵Justin Clark-Casey (justincc)2013-08-071-0/+6
| | | | | | | | | | | | add minor details to some log messages, rename a misleading local variable name. No functional changes.
| * Add file missing from last commit 4c2f6deJustin Clark-Casey (justincc)2013-08-061-0/+108
| |
| * Add the experimental ability to dump stats (result of command "show stats ↵Justin Clark-Casey (justincc)2013-08-061-12/+40
| | | | | | | | | | | | | | | | all") to file OpenSimStats.log every 5 seconds. This can currently only be activated with the console command "debug stats record start". Off by default. Records to file OpenSimStats.log for simulator and RobustStats.log for ROBUST
| * Add "debug threadpool status" console command to show min/max/current ↵Justin Clark-Casey (justincc)2013-08-061-0/+23
| | | | | | | | worker/iocp threadpool numbers
| * Add "debug comms status" command to show current debug comms settingsJustin Clark-Casey (justincc)2013-08-051-0/+11
| |
| * Make it possible to switch whether we serialize osd requests per endpoint or ↵Justin Clark-Casey (justincc)2013-08-053-5/+74
| | | | | | | | | | | | not, either via config (SerializeOSDRequests in [Network]) or via the "debug comms set" console command. For debug purposes to assess what impact this has on network response in a heavy test environment.
| * minor: move "threads abort" and "force gc" console commands into debug ↵Justin Clark-Casey (justincc)2013-08-051-2/+2
| | | | | | | | category - these are not things one needs to do in normal operation
| * Make it possible to set worker/iocp min/max threadpool limits on the fly ↵Justin Clark-Casey (justincc)2013-08-051-0/+78
| | | | | | | | with the console command "debug threadpool set"
| * Add checks monitoring framework to provide alerts if certain conditions do ↵Justin Clark-Casey (justincc)2013-08-055-3/+385
| | | | | | | | | | | | not hold. Not yet in use.
| * Issue: 10 simultaneous TPs, many not making it. Now bypassing the per-url ↵Diva Canto2013-08-021-3/+3
| | | | | | | | lock -- we should be "ok" (or, more "ok") now that we have increased the connection limit on the http library. But this is a sensitive part of the code, so it may need reverting.
* | Merge branch 'master' into careminsterMelanie2013-08-012-15/+15
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * * Thanks Plugh for pointing out that the constructor that takes a ulong ↵teravus2013-08-012-15/+15
| | | | | | | | regionhandle and saves it to to X,Y vars in the OpenSim.Framework.Location object was inverting the X and Y resulting in X and Y confusion. The test also used 256x256 in the uint,uint constructor so it was unable to determine if the X and Y components swapped. I don't expect much upheaval from this commit, not a lot of features were using the ulong Location object constructor. The database never stores the ulong regionhandle... the prims are loaded by region Guid. LLUDPServer used it to determine regions that it handled in a service definition where there was simply a X == X test which has the same logical result un-switched as it did switched. Again, thanks LibOMV for the regionhandle code.
* | Merge branch 'master' into careminsterMelanie2013-08-012-22/+68
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * Make "abnormal thread terminations" into "ClientLogoutsDueToNoReceives" and ↵Justin Clark-Casey (justincc)2013-07-292-22/+68
| | | | | | | | | | | | | | add this to the StatsManager This reflects the actual use of this stat - it hasn't recorded general exceptions for some time. Make the sim extra stats collector draw the data from the stats manager rather than maintaing this data itself.
* | Merge branch 'master' into careminsterMelanie2013-07-292-0/+23
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-271-0/+18
| | | | | | | | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
| * Increased the rate of the PollServiceRequestManager to 0.5 secs (it was ↵Diva Canto2013-07-261-1/+1
| | | | | | | | 1sec). Group chat is going over the EQ... Hopefully this won't increase CPU when there's nothing going on, but we need to watch for that.
| * Fix regression tests relating to agent transfer by making simulator use last ↵Justin Clark-Casey (justincc)2013-07-261-0/+5
| | | | | | | | week's SIMULATOR/0.1 protocol for now.
* | Merge branch 'master' into careminsterMelanie2013-07-251-5/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs bin/OpenSimDefaults.ini
| * New Teleport protocol (V2), still compatible with V1 and older. (version of ↵Diva Canto2013-07-241-5/+6
| | | | | | | | | | | | | | | | the destination is being checked) In this new protocol, and as committed before, the viewer is not sent EnableSimulator/EstablishChildCommunication for the destination. Instead, it is sent TeleportFinish directly. TeleportFinish, in turn, makes the viewer send a UserCircuitCode packet followed by CompleteMovementIntoRegion packet. These 2 packets tend to occur one after the other almost immediately to the point that when CMIR arrives the client is not even connected yet and that packet is ignored (there might have been some race conditions here before); then the viewer sends CMIR again within 5-8 secs. But the delay between them may be higher in busier regions, which may lead to race conditions. This commit improves the process so there are are no race conditions at the destination. CompleteMovement (triggered by the viewer) waits until Update has been sent from the origin. Update, in turn, waits until there is a *root* scene presence -- so making sure CompleteMovement has run MakeRoot. In other words, there are two threadlets at the destination, one from the viewer and one from the origin region, waiting for each other to do the right thing. That makes it safe to close the agent at the origin upon return of the Update call without having to wait for callback, because we are absolutely sure that the viewer knows it is in th new region. Note also that in the V1 protocol, the destination was getting UseCircuitCode from the viewer twice -- once on EstablishAgentCommunication and then again on TeleportFinish. The second UCC was being ignored, but it shows how we were not following the expected steps...
* | Merge branch 'master' into careminsterMelanie2013-07-242-3/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Correct issue where the last instance of a sampled stat was shown 3x larger ↵Justin Clark-Casey (justincc)2013-07-231-1/+2
| | | | | | | | than it should have been (though internal use was correct)
| * Improve spacing between data and units on console stats displayJustin Clark-Casey (justincc)2013-07-231-3/+12
| |
| * For stats which can show average change over time, show the last sample as ↵Justin Clark-Casey (justincc)2013-07-231-1/+11
| | | | | | | | | | | | well as the average. This is somewhat cryptic at the moment, need to improve documentation.
| * EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to ↵Diva Canto2013-07-211-1/+1
| | | | | | | | lkalif for telling me how to route the information. The viewer effect is under the distance filter, so only avatars with cameras < 10m away see the beams.
| * Manage AgentUpdates more sanely:Diva Canto2013-07-211-0/+2
| | | | | | | | | | | | - The existing event to scene has been split into 2: OnAgentUpdate and OnAgentCameraUpdate, to better reflect the two types of updates that the viewer sends. We can run one without the other, which is what happens when the avie is still but the user is camming around - Added thresholds (as opposed to equality) to determine whether the update is significant or not. I thin these thresholds are ok, but we can play with them later - Ignore updates of HeadRotation, which were problematic and aren't being used up stream
| * Removed verbose debug from previous commitDiva Canto2013-07-211-1/+0
| |
| * PollServiceRequestManager: changed the long poll from a Queue to a List. No ↵Diva Canto2013-07-211-13/+17
| | | | | | | | need to dequeue and enqueue items every 1sec.
| * Delay the enqueueing of non-longpoll requests for 100ms. No need to have ↵Diva Canto2013-07-211-1/+11
| | | | | | | | these requests actively on the processing queue if it seems they're not ready.
* | Merge branch 'master' into careminsterMelanie2013-07-247-17/+102
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post ↵Diva Canto2013-07-181-1/+1
| | | | | | | | | | | | requests timeout in 60 secs. There's plenty of room for improvement in handling the EQs. Some other time...
| * Revert "Revert "I confuse myself. Let's try this variable name instead.""Diva Canto2013-07-181-3/+3
| | | | | | | | This reverts commit 52dc7b2a96a28798d55d07d79d003ce5e3d35216.
| * Revert "Revert "Do the same trick that dahlia did for Dequeue(timeout)""Diva Canto2013-07-181-2/+3
| | | | | | | | This reverts commit 5495df74436d6c0039a1500d979a964b003abfdf.
| * Revert "Revert "Putting the requests back in the queue while testing for ↵Diva Canto2013-07-181-3/+7
| | | | | | | | | | | | count >0 is not the smartest move..."" This reverts commit 71278919575b0e0222cdbe3c0cefa5919f9a75bc.
| * Revert "Revert "Didn't mean to commit this change in BlockingQueue.cs""Diva Canto2013-07-181-1/+1
| | | | | | | | This reverts commit fda91d93dad1fa6f901e8db5829aa8b70477c97e.
generated by cgit v1.1 at 2024-12-24 02:24:25 +0000