aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bin/BulletXNA.dllbin614400 -> 614400 bytes
-rw-r--r--bin/BulletXNA.pdbbin1875456 -> 1969664 bytes
-rw-r--r--bin/OpenSimDefaults.ini25
3 files changed, 25 insertions, 0 deletions
diff --git a/bin/BulletXNA.dll b/bin/BulletXNA.dll
index 1e3f042..5e69b2e 100644
--- a/bin/BulletXNA.dll
+++ b/bin/BulletXNA.dll
Binary files differ
diff --git a/bin/BulletXNA.pdb b/bin/BulletXNA.pdb
index 4b83b83..3d4906f 100644
--- a/bin/BulletXNA.pdb
+++ b/bin/BulletXNA.pdb
Binary files differ
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 85f7708..892290e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -904,6 +904,19 @@
904 904
905[BulletSim] 905[BulletSim]
906 ; World parameters 906 ; World parameters
907
908 ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
909 ; bulletxna is a managed C# dll. They have comparible functionality.. the c++ is much faster.
910
911 BulletEngine = "bulletunmanaged"
912 ; BulletEngine = "bulletxna"
913
914 ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain. If you're using the bulletxna engine,
915 ; you will want to switch to the heightfield option
916
917 TerrainImplementation = 1
918 ; TerrainImplementation = 0
919
907 DefaultFriction = 0.20 920 DefaultFriction = 0.20
908 DefaultDensity = 10.000006836 921 DefaultDensity = 10.000006836
909 DefaultRestitution = 0.0 922 DefaultRestitution = 0.0
@@ -955,6 +968,7 @@
955 PhysicsLoggingEnabled = False 968 PhysicsLoggingEnabled = False
956 PhysicsLoggingDir = "." 969 PhysicsLoggingDir = "."
957 VehicleLoggingEnabled = False 970 VehicleLoggingEnabled = False
971
958 972
959[RemoteAdmin] 973[RemoteAdmin]
960 enabled = false 974 enabled = false
@@ -1105,6 +1119,17 @@
1105 1119
1106 ;exclude_list=User 1,User 2,User 3 1120 ;exclude_list=User 1,User 2,User 3
1107 1121
1122 ;;Shows modal alertbox for entering agent on IRC enabled regions
1123 ;;
1124 ;; Enable Alert, default = false
1125 ;alert_show = false
1126 ;;
1127 ;; Show IRC serverinfo, default = true
1128 ;alert_show_serverinfo = true
1129 ;;
1130 ;alert_msg_pre = "This region is linked to Irc."
1131 ;alert_msg_post = "Everything you say in public chat can be listened."
1132
1108 1133
1109; The following settings control the progression of daytime 1134; The following settings control the progression of daytime
1110; in the Sim. The defaults are the same as the commented out settings 1135; in the Sim. The defaults are the same as the commented out settings