Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Add a queue with two priority levels. This is a drop in replacement for | Melanie | 2012-08-28 | 1 | -2/+111 | |
| | | | | | | | | | | | | | | | | the BlockingQueue from OMV, but allows two priorities. | |||||
| * | | | Fix a nullref while object is being created | Melanie | 2012-08-28 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-29 | 4 | -65/+117 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | A few more changes to keyframes | UbitUmarov | 2012-08-29 | 4 | -65/+117 | |
| | | | | ||||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-29 | 1 | -115/+165 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | [Potentially broken] keyframes changes.. since it's there, use timer for | UbitUmarov | 2012-08-29 | 1 | -115/+165 | |
| | | | | | | | | | | | | | | | | crossing retries and not still another thread, etc... | |||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-28 | 8 | -117/+313 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | [possible still very broken] mess around keyframes. timer events | UbitUmarov | 2012-08-28 | 8 | -115/+311 | |
| |/ / | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing... | |||||
| * | | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal | UbitUmarov | 2012-08-26 | 1 | -2/+2 | |
| |/ | | | | | | | DataFormat enum, using values from the KFM constants | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-25 | 14 | -66/+189 | |
|\ \ | |/ | ||||||
| * | Merge branch 'ubitwork' into avination | Melanie | 2012-08-24 | 6 | -5/+9 | |
| |\ | ||||||
| | * | let setLinkPrimParams terminate even if there are no more parts. | UbitUmarov | 2012-08-16 | 1 | -2/+3 | |
| | | | ||||||
| * | | Remove debug spam | Melanie | 2012-08-24 | 1 | -2/+2 | |
| | | | ||||||
| * | | Fix background inventory loading (Viewer 3) so it won't lag out the sim | Melanie | 2012-08-24 | 3 | -51/+107 | |
| | | | ||||||
| * | | Fix bad child prim permissions that can make objects change perms after rezzing | Melanie | 2012-08-23 | 3 | -3/+39 | |
| | | | ||||||
| * | | Make terrain save every 1000 frames instead of every 50. Database load is a ↵ | Melanie | 2012-08-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | sim killer. | |||||
| * | | Fix group return stuff | Melanie | 2012-08-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | Allow updates sent for right pec to go to the client | Melanie | 2012-08-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | Implement seeing busy status in LSL | Melanie | 2012-08-21 | 1 | -0/+7 | |
| | | | ||||||
| * | | Cause a persistence save if prim flags change | Melanie | 2012-08-21 | 1 | -0/+2 | |
| | | | ||||||
| * | | Add Camera Offsets to serialization | Melanie | 2012-08-21 | 1 | -0/+14 | |
| | | | ||||||
| * | | Fix scripted detach of temp attachments | Melanie | 2012-08-20 | 1 | -6/+2 | |
| | | | ||||||
| * | | Make the console output from the reigon console hookable | Melanie | 2012-08-18 | 2 | -0/+11 | |
| | | | ||||||
| * | | Fix a typo | Melanie | 2012-08-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-16 | 5 | -3/+6 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | fix vs2010 build | UbitUmarov | 2012-08-16 | 5 | -3/+6 | |
| |/ | ||||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-16 | 60 | -791/+2092 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' into careminster | Melanie | 2012-08-16 | 14 | -223/+466 | |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | Do a proper null check to avoid the overloaded operator == trap | Melanie | 2012-08-16 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-15 | 13 | -222/+465 | |
| | |\ | ||||||
| | | * | Don't enable the thread watchdog until all regions are ready. | Justin Clark-Casey (justincc) | 2012-08-15 | 2 | -7/+33 | |
| | | | | | | | | | | | | | | | | This is to avoid false positives when the machine is under heavy load whilst starting up. | |||||
| | | * | adding ATTACH_*_PEC constants | SignpostMarv | 2012-08-15 | 1 | -0/+2 | |
| | | | | ||||||
| | | * | BulletSim: add hinge constraint. | Robert Adams | 2012-08-15 | 3 | -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 Adams | 2012-08-15 | 2 | -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 Adams | 2012-08-15 | 5 | -34/+44 | |
| | | | | | | | | | | | | | | | | and then commenting out most of the additions. | |||||
| | | * | BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. ↵ | Robert Adams | 2012-08-15 | 1 | -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 Adams | 2012-08-15 | 1 | -12/+13 | |
| | | | | | | | | | | | | | | | | were linksets in the region. | |||||
| | | * | BulletSim: Refactor BSConstraintCollection to add a new ↵ | Robert Adams | 2012-08-15 | 1 | -4/+12 | |
| | | | | | | | | | | | | | | | | RemoveAndDestroyConstraint(BSConstraint xx) | |||||
| | | * | BulletSim: add BSConstraint.RecomputConstraintVariables for the ↵ | Robert Adams | 2012-08-15 | 1 | -0/+17 | |
| | | | | | | | | | | | | | | | | recomputation after linksets changed, etc | |||||
| | | * | BulletSim: Add the class BSCharacter to the DetailLog output | Robert Adams | 2012-08-15 | 1 | -6/+10 | |
| | | | | ||||||
| | | * | BulletSim: rework physics FPS calculation to make a more realistic number. | Robert Adams | 2012-08-15 | 1 | -3/+8 | |
| | | | | ||||||
| | * | | Implementing PRIM_LINK_TARGET in a non-recursive fashion | SignpostMarv | 2012-08-15 | 1 | -49/+74 | |
| | |/ | ||||||
| | * | Let the temp attachment module add a command to allow attaching without ↵ | Melanie | 2012-08-15 | 2 | -34/+77 | |
| | | | | | | | | | | | | permissions and add support for this (incomplete!) to LSL | |||||
| | * | Add support for the extra params to scene and the event manager | Melanie | 2012-08-15 | 2 | -0/+62 | |
| | | | ||||||
| | * | Fix and finish the extra parameters storage system for MySQL | Melanie | 2012-08-15 | 1 | -1/+57 | |
| | | | ||||||
| | * | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 10 | -0/+113 | |
| | | | ||||||
| | * | Actually add the module | Melanie | 2012-08-14 | 1 | -0/+234 | |
| | | | ||||||
| | * | Allow the use of the region debug console found in recent viewers. This console | Melanie | 2012-08-14 | 6 | -3/+60 | |
| | | | | | | | | | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console. | |||||
| * | | Remove AreUpdatesSuspended flag because it does nothing | Melanie | 2012-08-16 | 3 | -36/+0 | |
| | | | ||||||
| * | | Change case of areUpdatesSuspended to upper case as is proper for a property | Melanie | 2012-08-16 | 3 | -20/+20 | |
| | | |