aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-08-0739-216/+1318
|\ | | | | | | | | | | | | 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-074-25/+48
| | | | | | | | | | | | add minor details to some log messages, rename a misleading local variable name. No functional changes.
| * Add post-CreateAgent teleport cancellation/abortion functionality from v1 ↵Justin Clark-Casey (justincc)2013-08-071-0/+21
| | | | | | | | | | | | | | transfer protocol into v2. This stops OpenSimulator still trying to teleport the user if they hit cancel on the teleport screen or closed the viewer whilst the protocol was trying to create an agent on the remote region. Ideally, the code may also attempt to tell the destination simulator that the agent should be removed (accounting for issues where the destination was not responding in the first place, etc.)
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-073-12/+171
| |\
| | * 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
| * | Fixed incomplete commit r/23317 -- see_into_region. Put the guard around ↵Diva Canto2013-08-073-18/+16
| |/ | | | | | | estate bans also, and delete the obsolete config var.
| * 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.
| * For LLImageManagerTests, make tests execute under synchronous fire and ↵Justin Clark-Casey (justincc)2013-08-051-8/+12
| | | | | | | | | | | | forget conditions. I generally prefer this approach for regression tests because of the complexity of accounting for different threading conditions.
| * 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
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-051-2/+1
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-0510-24/+437
| | |\
| | * | Child agent updates: remove the dependency on the root agent's camera ↵Diva Canto2013-08-051-2/+1
| | | | | | | | | | | | | | | | position. That was a complete overkill that is unnecessary at this point.
| * | | 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"
| * | Comment out debug log lines about script modules comms for now.Justin Clark-Casey (justincc)2013-08-051-2/+2
| | | | | | | | | | | | If this is an issue, could change log4net config instead to allow re-enablement
| * | At OpenSimulator startup, print out default min built-in threadpool threads ↵Justin Clark-Casey (justincc)2013-08-051-14/+27
| | | | | | | | | | | | | | | | | | | | | as well as max. Make it clear that we only try to adjust max, and log at warn level if this fails. Other minor logging cleanup.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-052-3/+11
| |\ \
| | * | Remove some debugging from simian connectors.Mic Bowman2013-08-052-3/+11
| | | |
| * | | Make test AssetsClient print out more information about any failure to set ↵Justin Clark-Casey (justincc)2013-08-051-2/+12
| |/ / | | | | | | | | | thread numbers and immediate post config thread numbers
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-051-2/+2
| |\ \ | | |/
| | * Group notices bug fix: use a new IM for each member of the group, otherwise ↵Diva Canto2013-08-051-2/+2
| | | | | | | | | | | | the fields get messed up because the transfer is async
| * | 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.
| * Fix the failing TestSendImage. J2K decoding is async.Diva Canto2013-08-031-1/+9
| |
| * More on HG inventory and OutboundPermission: disallowing giving inventory to ↵Diva Canto2013-08-032-1/+15
| | | | | | | | foreigners if OutboundPermission is false
| * HG: If OutboundPermission is set to false, let's enforce stricter ↵Diva Canto2013-08-032-0/+34
| | | | | | | | permissions by not allowing objects to be taken to inventory.
| * Making the J2KDecoderModule decoder function async. Could this be the cause ↵Diva Canto2013-08-031-1/+1
| | | | | | | | of sim freeze? -- HandleRequestImage in LLClientView is now sync, which means that it cannot take too long to complete. However, its execution path may end up in J2KDecoderModule.Decode, which is heavy and could stop the packet processing thread while it's at it.
| * Amend Justin's last commit regarding the new config var ServiceVersion. The ↵Diva Canto2013-08-021-1/+2
| | | | | | | | section may not exist at all.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-0213-123/+374
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-0212-96/+353
| | |\
| | | * BulletSim: When converting linkset types, don't try to change the listRobert Adams2013-08-021-9/+20
| | | | | | | | | | | | | | | | of linkset children while iterating through the list.
| | | * BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'Robert Adams2013-08-029-7/+159
| | | | | | | | | | | | | | | | | | | | and processing routines in BulletSim. Add linkset rebuild/conversion routine in BSLinkset.
| | | * BulletSim: add BSLinkInfo structure to remember link specific informationRobert Adams2013-08-023-86/+174
| | | | | | | | | | | | | | | | | | | | | | | | for each link in a linkset. Extend BSLinksetConstraint to create and use BSLinkInfo with the default static constraint.
| | | * Fix problem with modInvoke defined integer constants being build intoRobert Adams2013-08-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | scripts as boxed integers rather than proper reference to a new LSLInteger. This fixes an exception when using a registered integer constant in a script.
| | * | Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be ↵Justin Clark-Casey (justincc)2013-08-022-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manually forced in a new [SimulationService] config setting. This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not "SIMULATION/0.2" (the newer teleport protocol) remains the default. If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol. Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
| * | | 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.
| * | Turn off edit beams when object is derezed while being edited. (mantis #6722)Diva Canto2013-08-011-0/+6
| |/
| * minor: replace veclist.Add(new Vector3(0,0,0)) with Vector3.Zero in ↵Justin Clark-Casey (justincc)2013-08-021-1/+1
| | | | | | | | InventoryAccessModules.RezObject() - structs are passed by value
| * Move experimental attachments throttling further down the chain so that ↵Justin Clark-Casey (justincc)2013-08-021-16/+15
| | | | | | | | multiple attachments changes (e.g. change outfit) are also throttled
* | Make atachment state load work againMelanie2013-08-021-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-08-014-32/+105
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-08-012-15/+15
| |\
| | * * 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.
| * | minor: Add name to debug lludp packet level feedback on consoleJustin Clark-Casey (justincc)2013-08-011-1/+1
| |/
| * Add experimental "debug attachments throttle <ms>" setting (command line) ↵Justin Clark-Casey (justincc)2013-08-011-15/+87
| | | | | | | | | | | | | | | | | | | | and ThrottlePer100PrimsRezzed in [Attachments] in config This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously. It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in. Default is 0 (no throttling). "debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable. Also adds "debug attachments status" command to show current throttle and debug logging levels.
| * Try a different approach to slow terrain update by always cycling the loop ↵Justin Clark-Casey (justincc)2013-08-011-1/+2
| | | | | | | | | | | | | | | | immediately if any data was sent, rather than waiting. What I believe is happening is that on initial terrain send, this is done one packet at a time. With WaitOne, the outbound loop has enough time to loop and wait again after the first packet before the second, leading to a slower send. This approach instead does not wait if a packet was just sent but instead loops again, which appears to lead to a quicker send without losing the cpu benefit of not continually looping when there is no outbound data.
| * Revert "Issue: painfully slow terrain loading. The cause is commit ↵Justin Clark-Casey (justincc)2013-08-011-5/+5
| | | | | | | | | | | | d9d995914c5fba00d4ccaf66b899384c8ea3d5eb (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does." This reverts commit 59b461ac0eaae1cc34bb82431106fdf0476037f3.
| * Issue: painfully slow terrain loading. The cause is commit ↵Diva Canto2013-08-011-5/+5
| | | | | | | | d9d995914c5fba00d4ccaf66b899384c8ea3d5eb (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does.
* | Merge branch 'master' into careminsterMelanie2013-08-0131-425/+1143
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs