aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini15
1 files changed, 5 insertions, 10 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index d6eee0e..107e859 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -14,15 +14,6 @@
14 ; Place to create a PID file 14 ; Place to create a PID file
15 ; PIDFile = "/tmp/my.pid" 15 ; PIDFile = "/tmp/my.pid"
16 16
17 ; Http proxy support for llHTTPRequest and dynamic texture loading
18 ; Set HttpProxy to the URL for your proxy server if you would like
19 ; to proxy llHTTPRequests through a firewall
20 ; HttpProxy = "http://proxy.com"
21 ; Set HttpProxyExceptions to a list of regular expressions for
22 ; URLs that you don't want going through the proxy such as servers
23 ; inside your firewall, separate patterns with a ';'
24 ; HttpProxyExceptions = ".mydomain.com;localhost"
25
26 startup_console_commands_file = "startup_commands.txt" 17 startup_console_commands_file = "startup_commands.txt"
27 shutdown_console_commands_file = "shutdown_commands.txt" 18 shutdown_console_commands_file = "shutdown_commands.txt"
28 19
@@ -163,7 +154,11 @@
163 ; mesh, and use it for collisions. This is currently experimental code and enabling 154 ; mesh, and use it for collisions. This is currently experimental code and enabling
164 ; it may cause unexpected physics problems. 155 ; it may cause unexpected physics problems.
165 ;UseMeshiesPhysicsMesh = false 156 ;UseMeshiesPhysicsMesh = false
166 157
158 ; enable / disable Collada mesh support
159 ; default is true
160 ; ColladaMesh = true
161
167 ; Choose one of the physics engines below 162 ; Choose one of the physics engines below
168 ; OpenDynamicsEngine is by some distance the most developed physics engine 163 ; OpenDynamicsEngine is by some distance the most developed physics engine
169 ; basicphysics effectively does not model physics at all, making all objects phantom 164 ; basicphysics effectively does not model physics at all, making all objects phantom