aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-2846-613/+1456
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * 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.
| * 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-271-2/+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-257-0/+7
| | | | | | | | with other monitoring code from OpenSim.Framework
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-2518-18/+18
| | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| * Add experimental "OpenSim object memory churn" statistics to output of ↵Justin Clark-Casey (justincc)2012-07-253-55/+57
| | | | | | | | | | | | | | | | 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-257-18/+79
| | | | | | | | | | 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-256-136/+350
|\ \ | |/ | | | | | | 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.
| | * BulletSim: small optimizations for link and unlink codeRobert Adams2012-07-231-12/+8
| | |
| | * BulletSim: add Dispose() code to free up resources and close log files.Robert Adams2012-07-231-0/+21
| | |
| | * BulletSim: add all the new functions to BulletSimAPI.Robert Adams2012-07-232-6/+139
| | | | | | | | | | | | Modify ZeroMotion() to not make tainting calls and to use new API calls.
| | * BulletSim: improve linking to add each link individually rather than ↵Robert Adams2012-07-231-60/+76
| | | | | | | | | | | | rebuilding the object each time. Makes it an O(n) operation rather than O(n\!).
| * | extend regression TestDetachScriptedAttachementToInventory() to check ↵Justin Clark-Casey (justincc)2012-07-241-3/+25
| |/ | | | | | | correct running status on a re-rezzed attachment
| * Change attachment handling to remove object from the scene first as perMelanie2012-07-235-42/+82
| | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
| * Committing Avination's memleak fix-a-thon, installment #3Melanie2012-07-231-0/+2
| | | | | | | | | | | | When linking, detach the no longer used SOG's from backup so they can be collected. Since their Children collection is never emptied, they prevent their former SOPs from being collected as well.
* | Remove support for the OS_NPC constant. That one seems to be overly paranoidMelanie2012-07-252-4/+2
| | | | | | | | to have and confuses the issue.
* | Merge branch 'avination' into careminsterMelanie2012-07-235-42/+81
|\ \
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-235-42/+81
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | | Merge branch 'avination' into careminsterMelanie2012-07-231-1/+1
|\ \ \ | |/ /
| * | Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
| | | | | | | | | | | | if the client told us it wants to log out in the first place.
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
* | | Merge branch 'master' into careminsterMelanie2012-07-2310-249/+729
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * | BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵Robert Adams2012-07-202-2/+3
| | | | | | | | | | | | attempting to fix a mono compile error.
| * | BulletSim: more detail logging for vehicle and general physics debugging.Robert Adams2012-07-204-75/+244
| | | | | | | | | | | | | | | | | | | | | | | | Physical linksets are fully functional. Tweeking of the vehicle code to make it semi-work. Utilize the new API2 for some setting operations. Add GetOrientation() API call for proper reporting of children of linksets. Changes the interface between C# and C++ code so old DLLs won't work!
generated by cgit v1.1 at 2024-12-18 14:54:26 +0000