Merge branch 'master' into careminster-presence-refactor

2 files changed, 14 insertions, 11 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 55723d1..c05c3de 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -16,7 +16,7 @@
 ;; files are loaded then type "config show" on the region console command line.
 ;;
 ;; 
-;; NOTES FOR DEVELOPERS REGARDING FORMAT OF TIHS FILE
+;; NOTES FOR DEVELOPERS REGARDING THE FORMAT OF THIS FILE
 ;;
 ;; All leading white space is ignored, but preserved.
 ;;
@@ -201,6 +201,14 @@
     ;; If not generating maptiles, use this static texture asset ID
     ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
 
+    ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required
+    ; HttpProxy = "http://proxy.com:8080"
+
+    ;; If you're using HttpProxy, then you can set HttpProxyExceptions to a list of regular expressions for URLs that you don't want to go through the proxy 
+    ;; For example, servers inside your firewall.
+    ;; Separate patterns with a ';'
+    ; HttpProxyExceptions = ".mydomain.com;localhost"
+
     ;# {emailmodule} {} {Provide llEmail and llGetNextEmail functionality? (requires SMTP server)} {true false} false
     ;; The email module requires some configuration. It needs an SMTP
     ;; server to send mail through.
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