aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-049-29/+268
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| | | | | | | | Fixes Mantis #6327
| * Output monitor data in response to console command on MainConsole.Instance ↵Justin Clark-Casey (justincc)2012-10-041-2/+2
| | | | | | | | | | | | | | rather than m_log This should really be happening for all console commands (though many don't). However, things might get difficult if both a console command and other code invoke the same paths.
| * Add generic PercentageStat.Justin Clark-Casey (justincc)2012-10-042-3/+34
| | | | | | | | Not yet used.
| * Add experimental "slow frames" stat, available in "show stats" and via the ↵Justin Clark-Casey (justincc)2012-10-043-2/+158
| | | | | | | | | | | | | | | | | | monitoring module. This increments a SlowFrames counter if a frame takes over 120% of maximum time. This commit also introduces a generic OpenSim.Framework.Monitoring.Stat which is available to any code that wants to register a statistic. This is more granualar than asking objects to create their own reports. At some point this will supersede earlier IMonitor and IAlert facilities in MonitoringModule which are only available to scene code.
| * Soliciting for comments on smoothness of physics objects for this build.teravus2012-10-032-8/+46
| | | | | | | | | | This introduces expected contact point hints to the ODE Collider to better determine when to throttle updates as excessive. This /should/ smooth physics objects out again, however, I cannot know every configuration of OpenSimulator, so I'm requesting that testers please examine this change on their build. Thanks!
| * Fix the use of the wrong index when locating the assets associatedMic Bowman2012-10-031-1/+2
| | | | | | | | | | | | | | with wearables. The fact that this hasn't caused problems earlier suggests either that no one is using multiple layers of wearables or that this code is useless because the assets are coming in with the wearables request.
* | Merge branch 'master' into careminsterMelanie2012-10-031-5/+19
|\ \ | |/
| * Fix a viewer crash issueMelanie2012-10-031-1/+12
| | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * I propose that 0.5m/step change for linear velocity is too big of a change ↵teravus2012-10-031-1/+15
| | | | | | | | to control the reporting of a new angular velocity. I think that this could be here for one of two reasons, 1. vehicles and llMoveToTarget with axis lock, or 2. To attempt to make things look more stable in the physics scene then they really are, however, this also really affects the angular velocity reporting negatively causing things to spin wildly and jump back into place repeatedly. To compromise, if the prim is a vehicle or is being used as a motor target, the original functionality is still applied. If that's not the case, angular velocity is reported with a linear velocity of 0.02m/step. To be clear on the effect of the physical world... When you push things, there's still a lag time where you walk into the object but once the object is in motion, it begins to move as you would expect so results in slightly more realistic motion.
| * Minor Modification, switch /2 to 0.5f in ODEPrim.Velocityteravus2012-10-021-4/+4
| |
* | Merge branch 'avination' into careminsterMelanie2012-10-031-1/+12
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix a viewer crash issueMelanie2012-10-031-1/+12
| | |
| * | Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-0318-308/+647
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-0215-309/+598
| |\ \
| | * | correcting typoSignpostMarv2012-10-021-3/+3
| | | |
| | * | taking into account the recent introduction of implicit operatorsSignpostMarv2012-10-021-3/+1
| | | |
| | * | added perms checking, duplicated functionality to methods that do not ↵SignpostMarv2012-10-023-6/+86
| | | | | | | | | | | | | | | | require perms and have higher threat level
| | * | fixing copypastaSignpostMarv2012-10-021-1/+1
| | | |
| | * | implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-025-3/+72
| | | |
| | * | string format arguments in wrong orderSignpostMarv2012-10-021-1/+1
| | | |
| | * | BulletSim: Make parameter value defaults match what should be the default ↵Robert Adams2012-10-022-14/+14
| | | | | | | | | | | | | | | | and what is in OpenSimDefaults.ini. Comment and debug printout changes.
| | * | BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its ↵Robert Adams2012-10-023-5/+64
| | | | | | | | | | | | | | | | children of BSPrim and BSCharacter.
| | * | BulletSim: Fix problem where box shapes were not being rebuilt if the shape ↵Robert Adams2012-10-021-4/+6
| | | | | | | | | | | | | | | | type changed.
| | * | BulletSim: Fix linkset problem where delayed manipulations of child objects ↵Robert Adams2012-10-021-10/+8
| | | | | | | | | | | | | | | | was using the child shape address at call time rather than the one created at taint time.
| | * | BulletSim: call ForcePosition and ForceOrientation in BSDynamics so there is ↵Robert Adams2012-10-021-39/+57
| | | | | | | | | | | | | | | | no lag between what the vehicle code sees and what the physics engine is using.
| | * | Add Flush() method to LogWriter. Also correct line endings to Linux form.Robert Adams2012-10-021-161/+170
| | | |
| | * | BulletSim: fix the FloatOnWater code so avatars can normally go underwater.Robert Adams2012-10-021-1/+1
| | | |
| | * | BulletSim: impliment FloatOnWater OS function.Robert Adams2012-10-023-22/+104
| | | |
| | * | Correct my name in CONTRIBUTORS.txtRobert Adams2012-10-021-35/+16
| | | |
| | * | BulletSim: remove warnings for unused variables.Robert Adams2012-10-023-14/+7
| | | |
| * | | Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
| |/ /
| * | Add money event routing to the script engine.Melanie2012-10-021-0/+3
| | |
| * | Send money() events to the clicked prim. Reverting a change I made over a ↵Melanie2012-10-021-1/+1
| | | | | | | | | | | | year ago.
| * | Prevent the ExtraSettings code from crashing SQLite driven sims.Melanie2012-10-021-0/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-021-1/+1
|\ \ \ | |/ /
| * | On more virtual methodDiva Canto2012-10-011-1/+1
| | |
| * | Allow setting connection limits, part 2Melanie2012-09-301-1/+26
| | |
| * | Allow setting max connections for an endpointMelanie2012-09-302-4/+4
| | |
| * | Add using clause I missedMelanie2012-09-301-0/+1
| | |
| * | Allow up to 12 simultaneous connections to a given endpoint rather than 2Melanie2012-09-301-0/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-301-12/+1
|\ \ \ | |/ /
| * | Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-3025-41/+8
| | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
| * | Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-3025-8/+41
| | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-3019-1424/+2235
| |\ \
| * | | Made a method of GridUserService virtual so it can be overridden.Diva Canto2012-09-301-12/+1
| | | |
* | | | Merge branch 'avination' into careminsterMelanie2012-09-294-37/+140
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-09-284-57/+147
| |\ \ \
| | * | | make some forgotten changes be done by simulation thread not by callerUbitUmarov2012-09-272-34/+126
| | | | |