Commit Graph

20853 Commits (7ae0b5e6051e3da16f7d34c99dc9c58b75d4b373)

Author SHA1 Message Date
Melanie f671e446bf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-08-29 11:18:32 +02:00
UbitUmarov 2e54c3cc8f A few more changes to keyframes 2012-08-29 03:19:47 +01:00
UbitUmarov 72ac0665b2 [Potentially broken] keyframes changes.. since it's there, use timer for
crossing retries and not still another thread, etc...
2012-08-29 00:35:06 +01:00
Melanie 378a79e7cc Add a queue with two priority levels. This is a drop in replacement for
the BlockingQueue from OMV, but allows two priorities.
2012-08-28 22:17:17 +02:00
Melanie 5284e514d5 Fix a nullref while object is being created 2012-08-28 22:16:01 +02:00
UbitUmarov ef6e007a4c [possible still very broken] mess around keyframes. timer events
threads overlaps, some null objects exceptions, region crossing...
2012-08-28 03:21:03 +01:00
UbitUmarov b1d0fab954 fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal
DataFormat enum, using values from the KFM constants
2012-08-26 20:33:45 +01:00
Melanie bfa22e2f52 Make llCollisionSprite not throw anymore 2012-08-25 23:49:37 +02:00
UbitUmarov 9a80330875 Merge branch 'avination' into ubitwork 2012-08-25 15:21:51 +01:00
Melanie f1a71f544b Merge branch 'ubitwork' into avination 2012-08-24 23:53:14 +02:00
Melanie 6d48dbf8ca Remove debug spam 2012-08-24 23:49:31 +02:00
Melanie 7e17f4296e Fix background inventory loading (Viewer 3) so it won't lag out the sim 2012-08-24 23:48:01 +02:00
Melanie c1a0c7fad1 Fix bad child prim permissions that can make objects change perms after rezzing 2012-08-23 23:09:32 +02:00
Melanie 450207d4d8 Make terrain save every 1000 frames instead of every 50. Database load is a sim killer. 2012-08-22 00:27:54 +02:00
Melanie 526445c394 Fix group return stuff 2012-08-21 23:28:00 +02:00
Melanie 5273b6880a Allow updates sent for right pec to go to the client 2012-08-21 21:20:20 +02:00
Melanie 8d2a37c5a4 Implement seeing busy status in LSL 2012-08-21 20:13:55 +02:00
Melanie 26224704de Cause a persistence save if prim flags change 2012-08-21 19:24:41 +02:00
Melanie f2ac1b9e8a Add Camera Offsets to serialization 2012-08-21 16:41:08 +02:00
Melanie f71ed7eb79 Fix scripted detach of temp attachments 2012-08-20 15:35:06 +02:00
UbitUmarov a329c77063 Merge branch 'avination' into ubitwork 2012-08-19 06:14:49 +01:00
Melanie 0a959343a5 Make the console output from the reigon console hookable 2012-08-18 22:36:48 +02:00
Melanie 2efd13ae18 Fix a typo 2012-08-18 22:36:42 +02:00
UbitUmarov f9a318380b let setLinkPrimParams terminate even if there are no more parts. 2012-08-16 22:14:56 +01:00
UbitUmarov db3f0a3748 fix vs2010 build 2012-08-16 15:26:16 +01:00
Melanie 90ad98370a Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
Melanie 9995421df1 Do a proper null check to avoid the overloaded operator == trap 2012-08-16 02:35:03 +01:00
Melanie bbac8f76fa Remove AreUpdatesSuspended flag because it does nothing 2012-08-16 01:18:32 +02:00
Melanie b97053269b Change case of areUpdatesSuspended to upper case as is proper for a property 2012-08-16 01:02:20 +02:00
Melanie 4e5c19595c Fix casts and calls for link primitive param setting for avatars 2012-08-16 01:01:03 +02:00
Melanie 5ac77316e0 Remove XML debug spam from vivox voice 2012-08-16 00:59:58 +02:00
Melanie e286a95d76 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-08-15 22:59:31 +01:00
Melanie 684f8208d9 Do a proper null check to avoid the overloaded operator == trap 2012-08-15 23:58:39 +02:00
SignpostMarv 0aa1f1cc3f Implementing PRIM_LINK_TARGET in a non-recursive fashion 2012-08-15 22:58:33 +01:00
Justin Clark-Casey (justincc) 5a1b6fdf06 Don't enable the thread watchdog until all regions are ready.
This is to avoid false positives when the machine is under heavy load whilst starting up.
2012-08-15 22:43:32 +01:00
Melanie c313de630f Add a real_id field to the login response if impersonation is used. The wrapper
script needs this for proper logging.
2012-08-15 23:31:38 +02:00
SignpostMarv 8cd4042f9e Implementing PRIM_LINK_TARGET in a non-recursive fashion 2012-08-15 23:51:43 +01:00
SignpostMarv 7679384829 adding ATTACH_*_PEC constants 2012-08-15 22:06:20 +01:00
Robert Adams 9f83f4bfa3 BulletSim: update DLLs and SOs 2012-08-15 12:08:29 -07:00
Robert Adams 2b982ab212 BulletSim: add physics logging parameters to OpenSimDefaults.ini. Remove trailing semis from some the of the value definitions. 2012-08-15 12:08:25 -07:00
Robert Adams dd10cf01e7 BulletSim: add hinge constraint.
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.
2012-08-15 12:08:21 -07:00
Robert Adams 9efe7bf7ba BulletSim: add locking to constraintCollection and rename some of the public method variables to reduce confusion between a physics scene and the real scene. 2012-08-15 12:08:17 -07:00
Robert Adams 68f112888b BulletSim: clean up detail logging by adding many more debug log statements and then commenting out most of the additions. 2012-08-15 12:08:13 -07:00
Robert Adams b05a2fc4ed BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. Make sure the collisionCollection is reallocated each tick to fix race condition of it being cleared while still in use. 2012-08-15 12:08:09 -07:00
Robert Adams 257446889b BulletSim: fix problem of a null reference exception on shutdown if there were linksets in the region. 2012-08-15 12:08:05 -07:00
Robert Adams 77a7758cf5 BulletSim: Refactor BSConstraintCollection to add a new RemoveAndDestroyConstraint(BSConstraint xx) 2012-08-15 12:08:01 -07:00
Robert Adams c1c1d48af1 BulletSim: add BSConstraint.RecomputConstraintVariables for the recomputation after linksets changed, etc 2012-08-15 12:07:57 -07:00
Robert Adams 6f1f299619 BulletSim: Add the class BSCharacter to the DetailLog output 2012-08-15 12:07:53 -07:00
Robert Adams 11a4b9ec1d BulletSim: rework physics FPS calculation to make a more realistic number. 2012-08-15 12:07:49 -07:00
Melanie 3e946094a1 Merge branch 'master' into careminster 2012-08-15 19:37:38 +01:00