1 files changed, 5 insertions, 10 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 17bc537..3c4ceb9 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -14,15 +14,6 @@
     ; Place to create a PID file
     ; PIDFile = "/tmp/my.pid"
 
-    ; Http proxy support for llHTTPRequest and dynamic texture loading
-    ; Set HttpProxy to the URL for your proxy server if you would like
-    ; to proxy llHTTPRequests through a firewall
-    ; HttpProxy = "http://proxy.com"
-    ; Set HttpProxyExceptions to a list of regular expressions for
-    ; URLs that you don't want going through the proxy such as servers
-    ; inside your firewall, separate patterns with a ';'
-    ; HttpProxyExceptions = ".mydomain.com;localhost"
-
     startup_console_commands_file = "startup_commands.txt"
     shutdown_console_commands_file = "shutdown_commands.txt"
 
@@ -163,7 +154,11 @@
     ; mesh, and use it for collisions. This is currently experimental code and enabling
     ; it may cause unexpected physics problems.
     ;UseMeshiesPhysicsMesh = false
-    
+
+    ; enable / disable Collada mesh support
+    ; default is true
+    ; ColladaMesh = true
+
     ; Choose one of the physics engines below
     ; OpenDynamicsEngine is by some distance the most developed physics engine
     ; basicphysics effectively does not model physics at all, making all objects phantom