aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-1823-347/+469
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-1823-346/+469
| |\
| | * When reporting a thread timeout, create a copy of the info rather than passin...Justin Clark-Casey (justincc)2012-08-181-1/+14
| | * 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
| | * implementedSignpostMarv2012-08-173-0/+64
| | * attempt to handle InvalidCastException in a manner similar to Second LifeSignpostMarv2012-08-172-2/+17
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-172-17/+33
| | |\
| | | * BulletSim: Properly regenerate hulls when objects made physical.Robert Adams2012-08-172-17/+33
| | * | Add information to ThreadStackSize about possibly increasing if suffering Sta...Justin Clark-Casey (justincc)2012-08-171-1/+3
| | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-177-278/+149
| | |\
| | | * BulletSim: restore most of the Detail logging statements. Will haveRobert Adams2012-08-174-40/+51
| | | * Modify order of code so SOP doesn't set the physics actor flyingRobert Adams2012-08-171-7/+12
| | | * BulletSim: add parameters and functionality to specify the meshRobert Adams2012-08-174-48/+37
| | | * 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
| | * | minor: Make xengine debug message on script load a scripting loading message ...Justin Clark-Casey (justincc)2012-08-171-7/+9
| | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-178-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 ea...Robert Adams2012-08-153-2/+27
| | | * BulletSim: update DLLs and SOs to fix the problem with avatars jumping around...Robert Adams2012-08-154-0/+0
| | * | adding a clip method to handle Vector3 objects to enable a minor amount of re...SignpostMarv2012-08-172-6/+11
| | |/
| | * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-157-42/+149
* | | Merge branch 'master' into careminsterMelanie2012-08-1619-235/+483
|\ \ \ | |/ /
| * | 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-1518-234/+482
| |\
| | * Don't enable the thread watchdog until all regions are ready.Justin Clark-Casey (justincc)2012-08-152-7/+33
| | * adding ATTACH_*_PEC constantsSignpostMarv2012-08-151-0/+2
| | * BulletSim: update DLLs and SOsRobert Adams2012-08-154-0/+0
| | * BulletSim: add physics logging parameters to OpenSimDefaults.ini. Remove trai...Robert Adams2012-08-151-12/+17
| | * BulletSim: add hinge constraint.Robert Adams2012-08-153-6/+126
| | * BulletSim: add locking to constraintCollection and rename some of the public ...Robert Adams2012-08-152-147/+197
| | * BulletSim: clean up detail logging by adding many more debug log statements a...Robert Adams2012-08-155-34/+44
| | * BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. M...Robert Adams2012-08-151-15/+15
| | * BulletSim: fix problem of a null reference exception on shutdown if there wer...Robert Adams2012-08-151-12/+13
| | * BulletSim: Refactor BSConstraintCollection to add a new RemoveAndDestroyConst...Robert Adams2012-08-151-4/+12
| | * BulletSim: add BSConstraint.RecomputConstraintVariables for the recomputation...Robert Adams2012-08-151-0/+17
| | * 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
| |/
* | Remove AreUpdatesSuspended flag because it does nothingMelanie2012-08-163-36/+0
* | Change case of areUpdatesSuspended to upper case as is proper for a propertyMelanie2012-08-163-20/+20
* | Fix casts and calls for link primitive param setting for avatarsMelanie2012-08-161-4/+14
* | Remove XML debug spam from vivox voiceMelanie2012-08-161-12/+12
* | Do a proper null check to avoid the overloaded operator == trapMelanie2012-08-151-1/+1
* | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-159-6/+64
* | Implementing PRIM_LINK_TARGET in a non-recursive fashionSignpostMarv2012-08-152-117/+107
* | Merge branch 'master' into careminsterMelanie2012-08-150-0/+0
|\ \ | |/
| * Let the temp attachment module add a command to allow attaching without permi...Melanie2012-08-152-34/+77
| * Add support for the extra params to scene and the event managerMelanie2012-08-152-0/+62