aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-24 00:02:43 +0000
committerJustin Clark-Casey (justincc)2013-01-24 00:02:43 +0000
commita1f78ceb37dda544f8d04aa00bf3fedd298f024e (patch)
treee3f9b4f03f712dc63a4aefc5ac389f9b1c36ed8d /bin/OpenSimDefaults.ini
parentNew constants for llGetObjectDetails (diff)
parentBulletSim: remove setting of vehicle InterpolationRotationalVelocity. (diff)
downloadopensim-SC_OLD-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.zip
opensim-SC_OLD-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.tar.gz
opensim-SC_OLD-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.tar.bz2
opensim-SC_OLD-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini25
1 files changed, 25 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 45c3d40..889865b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -908,6 +908,19 @@
908 908
909[BulletSim] 909[BulletSim]
910 ; World parameters 910 ; World parameters
911
912 ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
913 ; bulletxna is a managed C# dll. They have comparible functionality.. the c++ is much faster.
914
915 BulletEngine = "bulletunmanaged"
916 ; BulletEngine = "bulletxna"
917
918 ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain. If you're using the bulletxna engine,
919 ; you will want to switch to the heightfield option
920
921 TerrainImplementation = 1
922 ; TerrainImplementation = 0
923
911 DefaultFriction = 0.20 924 DefaultFriction = 0.20
912 DefaultDensity = 10.000006836 925 DefaultDensity = 10.000006836
913 DefaultRestitution = 0.0 926 DefaultRestitution = 0.0
@@ -959,6 +972,7 @@
959 PhysicsLoggingEnabled = False 972 PhysicsLoggingEnabled = False
960 PhysicsLoggingDir = "." 973 PhysicsLoggingDir = "."
961 VehicleLoggingEnabled = False 974 VehicleLoggingEnabled = False
975
962 976
963[RemoteAdmin] 977[RemoteAdmin]
964 enabled = false 978 enabled = false
@@ -1109,6 +1123,17 @@
1109 1123
1110 ;exclude_list=User 1,User 2,User 3 1124 ;exclude_list=User 1,User 2,User 3
1111 1125
1126 ;;Shows modal alertbox for entering agent on IRC enabled regions
1127 ;;
1128 ;; Enable Alert, default = false
1129 ;alert_show = false
1130 ;;
1131 ;; Show IRC serverinfo, default = true
1132 ;alert_show_serverinfo = true
1133 ;;
1134 ;alert_msg_pre = "This region is linked to Irc."
1135 ;alert_msg_post = "Everything you say in public chat can be listened."
1136
1112 1137
1113; The following settings control the progression of daytime 1138; The following settings control the progression of daytime
1114; in the Sim. The defaults are the same as the commented out settings 1139; in the Sim. The defaults are the same as the commented out settings