* minor: Apply second patch from http://opensimulator.org/mantis/view.php?id=3089

* This adds more explanation for the new proxy settings in OpenSim.ini.example
* Also does some formatting correction
* I did some additional reformatting on top of that

1 files changed, 5 insertions, 0 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index e950c12..76ae234 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -8,7 +8,12 @@
     crash_dir = "crashes"
 
     ; 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"
 
     ; Set this to true if you are connecting your OpenSimulator regions to a grid