aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-187-37/+47
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * integrating redundant code into operatorSignpostMarv2012-08-182-14/+7
| |
| * Rot2Quaternion is now redundantSignpostMarv2012-08-182-12/+11
| |
| * constructor means not having to manually refer to individual propertiesSignpostMarv2012-08-183-6/+6
| |
| * implicit operators mean one does not need to instantiate new objects manuallySignpostMarv2012-08-182-7/+5
| |
| * adding missing refactor for LSL_VectorSignpostMarv2012-08-181-1/+1
| |
| * Implementing operators & constructors for QuaternionSignpostMarv2012-08-181-0/+18
| |
| * Fix the whitespace formatting error introduced by the last patchMelanie2012-08-181-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-08-189-124/+119
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactoring for Vector3 operator & constructor tweaksSignpostMarv2012-08-189-125/+119
| |
* | Merge branch 'master' into careminsterMelanie2012-08-1817-346/+455
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-1817-345/+455
| |\
| | * When reporting a thread timeout, create a copy of the info rather than ↵Justin Clark-Casey (justincc)2012-08-181-1/+14
| | | | | | | | | | | | | | | | | | | | | passing the original ThreadWatchdogInfo structure. This is to avoid the possibility of misleading reporting if a watchdog update outraces an alarm. Should address any remaining issues from http://opensimulator.org/mantis/view.php?id=6012
| | * adding null return to fix buildingSignpostMarv2012-08-171-1/+1
| | |
| | * fixing bug that get/set the wrong property for prim types other than sphere ↵SignpostMarv2012-08-172-3/+6
| | | | | | | | | | | | & box
| | * implementedSignpostMarv2012-08-173-0/+64
| | |
| | * attempt to handle InvalidCastException in a manner similar to Second LifeSignpostMarv2012-08-172-2/+17
| | |
| | * BulletSim: Properly regenerate hulls when objects made physical.Robert Adams2012-08-172-17/+33
| | | | | | | | | | | | | | | This fixes the problem of non-base shapes (cubes and spheres) falling through the terrain.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-176-278/+146
| | |\
| | | * BulletSim: restore most of the Detail logging statements. Will haveRobert Adams2012-08-174-40/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | no effect on non-logging running. Capture region name that is passed to the physics engine and use it for detail logging file name prefix. Fix problem with avatars dropping when flying across region boundries.
| | | * Modify order of code so SOP doesn't set the physics actor flyingRobert Adams2012-08-171-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | property multiple times every time Update is called. This eliminates zillions of settings which is better for BulletSim. The should be no functionality change.
| | | * BulletSim: add parameters and functionality to specify the meshRobert Adams2012-08-173-48/+34
| | | | | | | | | | | | | | | | | | | | | | | | level of detail for large meshes. Remove parameter and code for DetailLog (conditional logging into regular log file).
| | | * BulletSim: comments and parameter changes in dynamics engine.Robert Adams2012-08-172-26/+30
| | | |
| | | * BulletSim: in BSDynamics, merge 'flags' and 'hoverFlags' as they are defined ↵Robert Adams2012-08-171-158/+20
| | | | | | | | | | | | | | | | for the same bits and it makes the code less complicated.
| | * | minor: Make xengine debug message on script load a scripting loading message ↵Justin Clark-Casey (justincc)2012-08-171-7/+9
| | |/ | | | | | | | | | | | | | | | instead. This is more useful if compilation fails due to an uncatchable exception since we know what was being compiled.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-174-3/+28
| | |\
| | | * Correct an exception report in SceneObjectPart so it outputs the stack.Robert Adams2012-08-151-1/+1
| | | |
| | | * BulletSim: make it so objects in a linkset do not generate collisions with ↵Robert Adams2012-08-153-2/+27
| | | | | | | | | | | | | | | | each other.
| | * | adding a clip method to handle Vector3 objects to enable a minor amount of ↵SignpostMarv2012-08-172-6/+11
| | |/ | | | | | | | | | refactoring
| | * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-156-42/+141
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-1614-223/+466
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Do a proper null check to avoid the overloaded operator == trapMelanie2012-08-161-1/+1
| |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-1513-222/+465
| |\
| | * Don't enable the thread watchdog until all regions are ready.Justin Clark-Casey (justincc)2012-08-152-7/+33
| | | | | | | | | | | | This is to avoid false positives when the machine is under heavy load whilst starting up.
| | * adding ATTACH_*_PEC constantsSignpostMarv2012-08-151-0/+2
| | |
| | * BulletSim: add hinge constraint.Robert Adams2012-08-153-6/+126
| | | | | | | | | | | | | | | | | | | | | Update BulletSimAPI with new constraint related function calls. Reorganize locking in BS6DofConstraint. Update BS6DofConstraint to do constraint reset correctly. Add new 'midpoint' construction of 6Dof constraint.
| | * BulletSim: add locking to constraintCollection and rename some of the public ↵Robert Adams2012-08-152-147/+197
| | | | | | | | | | | | method variables to reduce confusion between a physics scene and the real scene.
| | * BulletSim: clean up detail logging by adding many more debug log statements ↵Robert Adams2012-08-155-34/+44
| | | | | | | | | | | | and then commenting out most of the additions.
| | * BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. ↵Robert Adams2012-08-151-15/+15
| | | | | | | | | | | | Make sure the collisionCollection is reallocated each tick to fix race condition of it being cleared while still in use.
| | * BulletSim: fix problem of a null reference exception on shutdown if there ↵Robert Adams2012-08-151-12/+13
| | | | | | | | | | | | were linksets in the region.
| | * BulletSim: Refactor BSConstraintCollection to add a new ↵Robert Adams2012-08-151-4/+12
| | | | | | | | | | | | RemoveAndDestroyConstraint(BSConstraint xx)
| | * BulletSim: add BSConstraint.RecomputConstraintVariables for the ↵Robert Adams2012-08-151-0/+17
| | | | | | | | | | | | recomputation after linksets changed, etc
| | * BulletSim: Add the class BSCharacter to the DetailLog outputRobert Adams2012-08-151-6/+10
| | |
| | * BulletSim: rework physics FPS calculation to make a more realistic number.Robert Adams2012-08-151-3/+8
| | |
| * | Implementing PRIM_LINK_TARGET in a non-recursive fashionSignpostMarv2012-08-151-49/+74
| |/
| * Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-152-34/+77
| | | | | | | | permissions and add support for this (incomplete!) to LSL
| * Add support for the extra params to scene and the event managerMelanie2012-08-152-0/+62
| |
| * Fix and finish the extra parameters storage system for MySQLMelanie2012-08-151-1/+57
| |
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-1510-0/+113
| |
| * Actually add the moduleMelanie2012-08-141-0/+234
| |