aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' into careminsterMelanie2012-08-0112-70/+288
| |\ \ | | |/
| | * Resolve a deadlock between INPCModule and SensorRepeat by replacing the ↵Justin Clark-Casey (justincc)2012-07-311-35/+43
| | | | | | | | | | | | | | | | | | | | | | | | SensorRepeat list with a new list on add/removes rather than locking it for the duration of the sensor sweep. A deadlock was observed today where NPC removal on a script thread would lock the NPC list and then try to lock the sensor list via scripted attachment removal. Concurrently, the sensor sweep thread would lock the sensor list and then try to lock the NPC list to check NPC status. This commit resolves the deadlock by replacing the sensor list on update rather than locking it for the duration of the sweep.
| | * Fix bug in SoundModule.TriggerSound() where every sound update to an avatar ↵Justin Clark-Casey (justincc)2012-07-311-3/+6
| | | | | | | | | | | | | | | | | | would base its gain calculation on the previous avatar's gain, instead of the original input gain. This was making sound attenuate oddly when there were NPCs in the region, though it could also happen with ordinary avatars.
| | * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-313-2/+74
| | | | | | | | | | | | constants to the script engine.
| | * BulletSim: add parameters and API calls for setting ERP and CFM.Robert Adams2012-07-316-29/+164
| | | | | | | | | | | | | | | | | | Set ERP and CFM in linkset constraints. Reorder rebuilding of object bodies so they are not rebuilt everytime something is linked and unlinked.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-301-1/+11
| | |\
| | * | If we're fetching active gestures via the XInventoryServiceConnector, then ↵Justin Clark-Casey (justincc)2012-07-301-1/+1
| | | | | | | | | | | | | | | | properly look at the ITEMS dictionary already returned rather than the level above this.
| * | | Merge branch 'avination' into careminsterMelanie2012-08-012-4/+12
| |\ \ \
| * \ \ \ Merge branch 'avination' into careminsterMelanie2012-07-295-5/+62
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-291-4/+10
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | | | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-1/+11
| | | |_|/ | | |/| |
| * | | | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-281-1/+1
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-07-2861-632/+1628
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| | * | | LSL/OSSL lacks Math.Min & Math.Max implementations.SignpostMarv2012-07-283-0/+54
| | | | |
| | * | | Avoid a race condition between the scene shutdown thread and the update ↵Justin Clark-Casey (justincc)2012-07-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread since commit c150320 (Thu Jul 26 15:27:18 2012) c150320 started explicitly disposing of the physics scene and nulling it out on region shutdown. However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation. This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked. This should not affect the few other places that use this flag.
| | * | | making first run more resilient to bad input (loop until good input, rather ↵SignpostMarv2012-07-271-7/+19
| | | | | | | | | | | | | | | | | | | | than crash)
| | * | | Remove the LandGeom checks in OdeScene - these are pointless since LandGeom ↵Justin Clark-Casey (justincc)2012-07-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is always IntPtr.Zero and contacts returned always have a valid geometry. Possibly this was for a feature that was never implemented or was otherwise removed. Thanks to SignpostMarv for the spot of the warning that shows this parameter was never changed.
| | * | | minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is ↵Justin Clark-Casey (justincc)2012-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | currently calculated dynamically
| | * | | Remove duplicated IScenePresence.PresenceType. This is already in ↵Justin Clark-Casey (justincc)2012-07-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISceneAgent.PresenceType from which IScenePresence inherits. No other code changes required.
| | * | | Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-272-3/+0
| | | | |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-276-235/+427
| | |\ \ \
| | | * | | BulletSim: fix a recursive loop when fetching the mass of the root of a linkset.Robert Adams2012-07-262-4/+4
| | | | | |
| | | * | | BulletSim: refactor all the linkset logic out of the prim classRobert Adams2012-07-264-235/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and into its own class. The BulletSim data structures track individual prims as linksets of 1 so most of the prim code is not different between a linked and unlinked object.
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2012-07-262-25/+49
| | | |\ \ \
| | | * | | | Add check so Ode does not try to simulate after it has been Dispose()'ed. ↵Robert Adams2012-07-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes exception that happens when shutting down region (improvements from last patch)
| | | * | | | Add a Dispose() of the physics engine when a scene is being shutdown.Robert Adams2012-07-261-0/+9
| | | | | | |
| | * | | | | Fix issue where RegionCombinerModule was not removing regions from its ↵Justin Clark-Casey (justincc)2012-07-271-0/+2
| | | |/ / / | | |/| | | | | | | | | | | | | | | dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded).
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-265-276/+778
| | |\ \ \ \ | | | |/ / /
| | | * | | BulletSim: remove unused, commented out code in BSConstraintRobert Adams2012-07-251-8/+0
| | | | | |
| | | * | | BulletSim: fix line endings in newly added files (Is it DOS or is it UNIX? ↵Robert Adams2012-07-252-301/+301
| | | | | | | | | | | | | | | | | | | | | | | | Only it's hairdresser knows for sure)
| | | * | | BulletSim: add parameters for setting linkset constraint factorsRobert Adams2012-07-252-17/+32
| | | | | |
| | | * | | BulletSim: small change to use the pointer to the bullet object for zeroing ↵Robert Adams2012-07-251-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | forces.
| | | * | | BulletSim: Redo parameter specification so only one place hasRobert Adams2012-07-251-248/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to change to have a parameter show up in the ini file and command line. Will make it much easier for the next person.
| | | * | | BulletSim: Add C# classes for storing and tracking constraints.Robert Adams2012-07-252-0/+301
| | | | | |
| | | * | | BulletSim: Move constraint tracking from C++ code to C# codeRobert Adams2012-07-252-18/+83
| | | | | | | | | | | | | | | | | | | | | | | | for more flexibility.
| | * | | | When copying items, copy the item description field instead of the asset ↵Justin Clark-Casey (justincc)2012-07-262-25/+49
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description field. If we copy the asset description then we will only ever replicate the very first description, if there was one, not any subsequent changes. Thanks to Oren Hurvitz of Kitely for this patch from http://opensimulator.org/mantis/view.php?id=6107 I have adapted it slightly to change the order of arguments (name before description rather than vice-versa) and slightly improve some method doc.
| | * | | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-2513-2/+13
| | | | | | | | | | | | | | | | | | | | with other monitoring code from OpenSim.Framework
| | * | | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-2526-29/+27
| | | | | | | | | | | | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| | * | | Add MemoryWatchdog class missing from git master a1e9964Justin Clark-Casey (justincc)2012-07-251-0/+129
| | | | |
| | * | | Correct churn stat from MB/s from KB/sJustin Clark-Casey (justincc)2012-07-251-1/+1
| | | | |
| | * | | Add experimental "OpenSim object memory churn" statistics to output of ↵Justin Clark-Casey (justincc)2012-07-255-63/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | region console "show stats" command This aims to capture the amount of memory that OpenSim turns over whilst operating a region. This memory is not lost - apart from leaks it is reclaimed by the garbage collector. However, the more memory that gets turned over the more work the GC has to do to reclaim it.
| | * | | Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-258-18/+87
| | | | | | | | | | | | | | | | | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
| * | | | Merge branch 'master' into careminsterMelanie2012-07-257-138/+370
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| | * | | Rename "image queues clear" console command to "clear image queues"Justin Clark-Casey (justincc)2012-07-241-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | There is less justification for this word arrangement (verb after noun) now that command help is categorized. Also removes "image queues show" in favour of existing alias "show image queues".
| | * | | Add information about each column to "show queues" region console command help.Justin Clark-Casey (justincc)2012-07-241-2/+9
| | | | |
| | * | | Extend region console "show queues" command to show already collected time ↵Justin Clark-Casey (justincc)2012-07-242-19/+26
| | | | | | | | | | | | | | | | | | | | since last packeted received by the simulator from a viewer.
| | * | | Remove bad using statement in AttachmentsModuleTests.Justin Clark-Casey (justincc)2012-07-241-2/+1
| | | | | | | | | | | | | | | | | | | | It seems that the mono 2.10.8.1 doesn't choke on this but for some reason 2.4.3 fails.
| | * | | extend regression TestRezScriptedAttachmentFromInventory() to check actual ↵Justin Clark-Casey (justincc)2012-07-241-3/+19
| | | | | | | | | | | | | | | | | | | | start of script rather than just the script status reported by SOG.ContainsScripts()
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-243-96/+265
| | |\ \ \
| | | * | | BulletSim: change how prim mass is saved so it is always calculated but zero ↵Robert Adams2012-07-231-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | is given if not physical.
generated by cgit v1.1 at 2024-12-18 05:52:24 +0000