diff options
author | Melanie | 2012-08-14 02:34:03 +0100 |
---|---|---|
committer | Melanie | 2012-08-14 02:34:03 +0100 |
commit | 9b014a71679b6697954eb446be9f3d7c2e0a61b9 (patch) | |
tree | a454037938403aa76339b021dab93af98fab1bf2 /bin | |
parent | Merge branch 'avination' into ubitwork (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-9b014a71679b6697954eb446be9f3d7c2e0a61b9.zip opensim-SC-9b014a71679b6697954eb446be9f3d7c2e0a61b9.tar.gz opensim-SC-9b014a71679b6697954eb446be9f3d7c2e0a61b9.tar.bz2 opensim-SC-9b014a71679b6697954eb446be9f3d7c2e0a61b9.tar.xz |
Merge branch 'careminster' into avination
Conflicts:
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSimDefaults.ini | 44 | ||||
-rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 533504 -> 534016 bytes | |||
-rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2340496 -> 2345796 bytes | |||
-rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 684032 -> 685056 bytes | |||
-rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2540931 -> 2551398 bytes |
5 files changed, 23 insertions, 21 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ced0bce..2571669 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -181,11 +181,6 @@ | |||
181 | ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago | 181 | ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago |
182 | MaximumTimeBeforePersistenceConsidered = 600 | 182 | MaximumTimeBeforePersistenceConsidered = 600 |
183 | 183 | ||
184 | ; Experimental setting to resend appearance updates every 60 seconds. | ||
185 | ; These packets are small and this can help with grey avatar syndrome. | ||
186 | ; Default is false | ||
187 | SendPeriodicAppearanceUpdates = false | ||
188 | |||
189 | ; ## | 184 | ; ## |
190 | ; ## PHYSICS | 185 | ; ## PHYSICS |
191 | ; ## | 186 | ; ## |
@@ -341,27 +336,12 @@ | |||
341 | ; OpenJPEG if false | 336 | ; OpenJPEG if false |
342 | ; UseCSJ2K = true | 337 | ; UseCSJ2K = true |
343 | 338 | ||
344 | |||
345 | ; Use "Trash" folder for items deleted from the scene | 339 | ; Use "Trash" folder for items deleted from the scene |
346 | ; When set to True (the default) items deleted from the scene will be | 340 | ; When set to True (the default) items deleted from the scene will be |
347 | ; stored in the user's trash or lost and found folder. When set to | 341 | ; stored in the user's trash or lost and found folder. When set to |
348 | ; False items will be removed from the scene permanently | 342 | ; False items will be removed from the scene permanently |
349 | UseTrashOnDelete = True | 343 | UseTrashOnDelete = True |
350 | 344 | ||
351 | ; Persist avatar baked textures | ||
352 | ; Persisting baked textures can speed up login and region border | ||
353 | ; crossings especially with large numbers of users, though it | ||
354 | ; will store potentially large numbers of textures in your asset | ||
355 | ; database | ||
356 | PersistBakedTextures = false | ||
357 | |||
358 | ; Control the delay before appearance is sent to other avatars and | ||
359 | ; saved in the avatar service. Attempts to limit the impact caused | ||
360 | ; by the very chatty dialog that sets appearance when an avatar | ||
361 | ; logs in or teleports into a region; values are in seconds | ||
362 | DelayBeforeAppearanceSave = 5 | ||
363 | DelayBeforeAppearanceSend = 2 | ||
364 | |||
365 | 345 | ||
366 | [RegionReady] | 346 | [RegionReady] |
367 | ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled | 347 | ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled |
@@ -671,6 +651,28 @@ | |||
671 | CoalesceMultipleObjectsToInventory = true | 651 | CoalesceMultipleObjectsToInventory = true |
672 | 652 | ||
673 | 653 | ||
654 | [Appearance] | ||
655 | ; Persist avatar baked textures | ||
656 | ; Persisting baked textures can speed up login and region border | ||
657 | ; crossings especially with large numbers of users, though it | ||
658 | ; will store potentially large numbers of textures in your asset | ||
659 | ; database | ||
660 | PersistBakedTextures = false | ||
661 | |||
662 | ; Control the delay before appearance is sent to other avatars and | ||
663 | ; saved in the avatar service. Attempts to limit the impact caused | ||
664 | ; by the very chatty dialog that sets appearance when an avatar | ||
665 | ; logs in or teleports into a region; values are in seconds | ||
666 | DelayBeforeAppearanceSave = 5 | ||
667 | DelayBeforeAppearanceSend = 2 | ||
668 | |||
669 | ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds. | ||
670 | ; This may help with some situations where avatars are persistently grey, though it will not help | ||
671 | ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). | ||
672 | ; This setting is experimental. | ||
673 | ResendAppearanceUpdates = false | ||
674 | |||
675 | |||
674 | [Attachments] | 676 | [Attachments] |
675 | ; Controls whether avatar attachments are enabled. | 677 | ; Controls whether avatar attachments are enabled. |
676 | ; Defaults to true - only set to false for debugging purposes | 678 | ; Defaults to true - only set to false for debugging purposes |
@@ -937,7 +939,7 @@ | |||
937 | FixedTimeStep = .01667 | 939 | FixedTimeStep = .01667 |
938 | 940 | ||
939 | MaxCollisionsPerFrame = 2048 | 941 | MaxCollisionsPerFrame = 2048 |
940 | MaxUpdatesPerFrame = 2048 | 942 | MaxUpdatesPerFrame = 8192 |
941 | 943 | ||
942 | [RemoteAdmin] | 944 | [RemoteAdmin] |
943 | enabled = false | 945 | enabled = false |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 03e8f26..f4953f9 100755 --- a/bin/lib32/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index 4e119c4..2b5702d 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
Binary files differ | |||
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 6e8d6b4..be191c0 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
Binary files differ | |||
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index 9363d1a..fc51b39 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
Binary files differ | |||