Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-15 | 12 | -217/+439 | |
| | |\ | ||||||
| | | * | Don't enable the thread watchdog until all regions are ready. | Justin Clark-Casey (justincc) | 2012-08-15 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | 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 | |
| | | | ||||||
| | * | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 3 | -0/+15 | |
| | | | ||||||
| | * | 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 | 1 | -0/+39 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | ||||||
| * | | Fix casts and calls for link primitive param setting for avatars | Melanie | 2012-08-16 | 1 | -4/+14 | |
| | | | ||||||
| * | | Remove XML debug spam from vivox voice | Melanie | 2012-08-16 | 1 | -12/+12 | |
| | | | ||||||
| * | | Do a proper null check to avoid the overloaded operator == trap | Melanie | 2012-08-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add a real_id field to the login response if impersonation is used. The wrapper | Melanie | 2012-08-15 | 1 | -0/+6 | |
| | | | | | | | | | | | | script needs this for proper logging. | |||||
| * | | Implementing PRIM_LINK_TARGET in a non-recursive fashion | SignpostMarv | 2012-08-15 | 1 | -116/+106 | |
| | | | ||||||
| * | | Let the temp attachment module add a command to allow attaching without ↵ | Melanie | 2012-08-15 | 2 | -32/+60 | |
| | | | | | | | | | | | | 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 | |
| | | | ||||||
| * | | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 3 | -0/+16 | |
| | | | ||||||
| * | | Remove NPC debug spam | Melanie | 2012-08-14 | 1 | -7/+7 | |
| | | | ||||||
| * | | 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 | 1 | -0/+39 | |
| | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-08-14 | 3 | -46/+85 | |
| |\ \ | | | | | | | | | | | | | avination | |||||
| | * \ | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 3 | -46/+85 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||||
| | | * \ | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 2 | -38/+49 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Prevent race conditions when one thread removes an NPC SP before another ↵ | Justin Clark-Casey (justincc) | 2012-08-14 | 2 | -39/+50 | |
| | | | | | | | | | | | | | | | | | | | | thread has retreived it after checking whether the NPC exists. | |||||
| | | * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -8/+36 | |
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||||
| | | | * | Perform ownership transfer and permission propagation as well as needed | Melanie | 2012-08-14 | 1 | -0/+28 | |
| | | | | | | | | | | | | | | | | | | | | updates on the new temp attachment. | |||||
| | | | * | Move inititalization to RegionLoaded to avoid a module loading order issue | Melanie | 2012-08-14 | 1 | -8/+8 | |
| | | | | | ||||||
| * | | | | Removed more spammy NPC crap | Melanie | 2012-08-14 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Comment spammy debug | Melanie | 2012-08-14 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 21 | -374/+774 | |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 6 | -19/+166 | |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | * | Implement the temp attachments. UNTESTED | Melanie | 2012-08-14 | 1 | -0/+44 | |
| | | | | ||||||
| | | * | As per lindn spec, disable detach and drop for temp attachments | Melanie | 2012-08-14 | 1 | -0/+8 | |
| | | | | ||||||
| | | * | Add the skeleton for the temp attachments module | Melanie | 2012-08-14 | 1 | -0/+82 | |
| | | | | ||||||
| | | * | Lay some groundwork for temp attachments. Decouple attachments from inventory. | Melanie | 2012-08-14 | 5 | -20/+33 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-13 | 1 | -6/+68 | |
| | |\ \ | | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | * | attempt at replicating behaviour of llList2thing functions in SL | SignpostMarv | 2012-08-13 | 1 | -7/+69 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Committed with changes. Please don't sign comments with your name. Please don't use your own coding style, use the OpenSim project style. Please don't modify unrelated whitespace. Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-11 | 8 | -285/+377 | |
| | |\ \ | | | |/ | ||||||
| | | * | BulletSim: many, many detailed logging messages for physical linkset | Robert Adams | 2012-08-10 | 7 | -44/+78 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugging. Linkset bugs fixed where accounting of children would get lost. Moved scene based vehicle tracking logic from prim to the scene. Added GetCollisionFlags2 method to BulletSimAPI. Updated DLLs and SOs. |