aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example23
-rw-r--r--bin/OpenSimDefaults.ini59
-rwxr-xr-xbin/lib32/BulletSim.dllbin599040 -> 551424 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2778687 -> 1707625 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin765440 -> 699904 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin3034072 -> 1844588 bytes
6 files changed, 43 insertions, 39 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c7df7bb..e591a69 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -443,9 +443,30 @@
443 ;; What is reported as the "User-Agent" when using llHTTPRequest 443 ;; What is reported as the "User-Agent" when using llHTTPRequest
444 ;; Defaults to not sent if not set here. See the notes section in the wiki 444 ;; Defaults to not sent if not set here. See the notes section in the wiki
445 ;; at http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding 445 ;; at http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
446 ;; " (Mozilla Compatible)" to the text where there are problems with a web server 446 ;; " (Mozilla Compatible)" to the text where there are problems with a
447 ;; web server
447 ; user_agent = "OpenSim LSL (Mozilla Compatible)" 448 ; user_agent = "OpenSim LSL (Mozilla Compatible)"
448 449
450[XMLRPC]
451 ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
452 ;; If enabled and set to XmlRpcRouterModule, this will post an event,
453 ;; "xmlrpc_uri(string)" to the script concurrently with the first
454 ;; remote_data event. This will contain the fully qualified URI an
455 ;; external site needs to use to send XMLRPC requests to that script
456 ;;
457 ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
458 ;; will be registered with an external service via a configured uri
459 ;XmlRpcRouterModule = "XmlRpcRouterModule"
460
461 ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
462 ;XmlRpcPort = 20800
463
464 ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} http://example.com
465 ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
466 ;; will use this address to register xmlrpc channels on the external
467 ;; service
468 ; XmlRpcHubURI = http://example.com
469
449 470
450[ClientStack.LindenUDP] 471[ClientStack.LindenUDP]
451 ;; See OpensSimDefaults.ini for the throttle options. You can copy the 472 ;; See OpensSimDefaults.ini for the throttle options. You can copy the
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ed1b969..e9bdabc 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -221,10 +221,10 @@
221 ; to false if you have compatibility problems. 221 ; to false if you have compatibility problems.
222 ;CacheSculptMaps = true 222 ;CacheSculptMaps = true
223 223
224 ; Choose one of the physics engines below 224 ; Choose one of the physics engines below.
225 ; OpenDynamicsEngine is by some distance the most developed physics engine 225 ; OpenDynamicsEngine is by some distance the most developed physics engine.
226 ; basicphysics effectively does not model physics at all, making all objects phantom 226 ; BulletSim is a high performance, up-and-coming physics engine.
227 227 ; basicphysics effectively does not model physics at all, making all objects phantom.
228 physics = OpenDynamicsEngine 228 physics = OpenDynamicsEngine
229 ;physics = basicphysics 229 ;physics = basicphysics
230 ;physics = POS 230 ;physics = POS
@@ -368,6 +368,12 @@
368 ; alert_uri = "http://myappserver.net/my_handler/" 368 ; alert_uri = "http://myappserver.net/my_handler/"
369 369
370 370
371[EstateManagement]
372 ; If false, then block any region restart requests from the client even if they are otherwise valid.
373 ; Default is true
374 AllowRegionRestartFromClient = true
375
376
371[SMTP] 377[SMTP]
372 enabled = false 378 enabled = false
373 379
@@ -429,20 +435,6 @@
429 ; many simultaneous requests, default is 30 and is currently applied only to assets 435 ; many simultaneous requests, default is 30 and is currently applied only to assets
430 ;MaxRequestConcurrency = 30 436 ;MaxRequestConcurrency = 30
431 437
432[XMLRPC]
433 ; ##
434 ; ## Scripting XMLRPC mapper
435 ; ##
436
437 ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
438 ; script concurrently with the first remote_data event.
439 ; This will contain the fully qualified URI an external site needs
440 ; to use to send XMLRPC requests to that script
441
442 ;XmlRpcRouterModule = "XmlRpcRouterModule"
443 ;XmlRpcPort = 20800
444
445
446[ClientStack.LindenUDP] 438[ClientStack.LindenUDP]
447 ; Set this to true to process incoming packets asynchronously. Networking is 439 ; Set this to true to process incoming packets asynchronously. Networking is
448 ; already separated from packet handling with a queue, so this will only 440 ; already separated from packet handling with a queue, so this will only
@@ -916,18 +908,22 @@
916 908
917[BulletSim] 909[BulletSim]
918 ; World parameters 910 ; World parameters
919 DefaultFriction = 0.50 911 DefaultFriction = 0.20
920 DefaultDensity = 10.000006836 912 DefaultDensity = 10.000006836
921 DefaultRestitution = 0.0 913 DefaultRestitution = 0.0
922 Gravity = -9.80665 914 Gravity = -9.80665
923 915
924 TerrainFriction = 0.50 916 TerrainFriction = 0.30
925 TerrainHitFriction = 0.8 917 TerrainHitFraction = 0.8
926 TerrainRestitution = 0 918 TerrainRestitution = 0
919 TerrainCollisionMargin = 0.04
920
927 AvatarFriction = 0.2 921 AvatarFriction = 0.2
922 AvatarStandingFriction = 0.99
928 AvatarRestitution = 0.0 923 AvatarRestitution = 0.0
929 AvatarDensity = 60.0 924 AvatarDensity = 60.0
930 AvatarCapsuleRadius = 0.37 925 AvatarCapsuleWidth = 0.6
926 AvatarCapsuleDepth = 0.45
931 AvatarCapsuleHeight = 1.5 927 AvatarCapsuleHeight = 1.5
932 AvatarContactProcessingThreshold = 0.1 928 AvatarContactProcessingThreshold = 0.1
933 929
@@ -937,27 +933,15 @@
937 LinearDamping = 0.0 933 LinearDamping = 0.0
938 AngularDamping = 0.0 934 AngularDamping = 0.0
939 DeactivationTime = 0.2 935 DeactivationTime = 0.2
940 LinearSleepingThreshold = 0.8 936 CollisionMargin = 0.04
941 AngularSleepingThreshold = 1.0
942 CcdMotionThreshold = 0.0
943 CcdSweptSphereRadius = 0.0
944 ContactProcessingThreshold = 0.1
945 ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc)
946 MaxPersistantManifoldPoolSize = 0
947 ShouldDisableContactPoolDynamicAllocation = False
948 ShouldForceUpdateAllAabbs = False
949 ShouldRandomizeSolverOrder = True
950 ShouldSplitSimulationIslands = True
951 ShouldEnableFrictionCaching = False
952 NumberOfSolverIterations = 0
953 937
954 ; Linkset constraint parameters 938 ; Linkset constraint parameters
939 LinkImplementation = 1 ; 0=constraint, 1=compound
955 LinkConstraintUseFrameOffset = False 940 LinkConstraintUseFrameOffset = False
956 LinkConstraintEnableTransMotor = True 941 LinkConstraintEnableTransMotor = True
957 LinkConstraintTransMotorMaxVel = 5.0 942 LinkConstraintTransMotorMaxVel = 5.0
958 LinkConstraintTransMotorMaxForce = 0.1 943 LinkConstraintTransMotorMaxForce = 0.1
959 944
960
961 ; Whether to mesh sculpties 945 ; Whether to mesh sculpties
962 MeshSculptedPrim = true 946 MeshSculptedPrim = true
963 947
@@ -1599,8 +1583,7 @@
1599 1583
1600 ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets. 1584 ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
1601 ; This reduces data churn 1585 ; This reduces data churn
1602 ; This setting is currently experimental and defaults to false. 1586 RecycleBaseUDPPackets = true
1603 RecycleBaseUDPPackets = false;
1604 1587
1605 1588
1606[InterestManagement] 1589[InterestManagement]
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 51526a7..38b11cd 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 8bb9d10..f59ec97 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 1a07d6a..1861d6d 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 bbdd380..e9b8845 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ