aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-12 23:22:21 +0100
committerJustin Clark-Casey (justincc)2011-04-12 23:22:21 +0100
commit424995e1384178462799469e0200615308035460 (patch)
treef92e60733b8397576b86c486e05aa5219f27d034
parentminor typo correction. thanks Ai Austin. (diff)
downloadopensim-SC_OLD-424995e1384178462799469e0200615308035460.zip
opensim-SC_OLD-424995e1384178462799469e0200615308035460.tar.gz
opensim-SC_OLD-424995e1384178462799469e0200615308035460.tar.bz2
opensim-SC_OLD-424995e1384178462799469e0200615308035460.tar.xz
Move example HttpProxy setting to OpenSim.ini.example and tidy
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example8
-rw-r--r--bin/OpenSimDefaults.ini9
2 files changed, 8 insertions, 9 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 823daa0..c05c3de 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -201,6 +201,14 @@
201 ;; If not generating maptiles, use this static texture asset ID 201 ;; If not generating maptiles, use this static texture asset ID
202 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" 202 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
203 203
204 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required
205 ; HttpProxy = "http://proxy.com:8080"
206
207 ;; 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
208 ;; For example, servers inside your firewall.
209 ;; Separate patterns with a ';'
210 ; HttpProxyExceptions = ".mydomain.com;localhost"
211
204 ;# {emailmodule} {} {Provide llEmail and llGetNextEmail functionality? (requires SMTP server)} {true false} false 212 ;# {emailmodule} {} {Provide llEmail and llGetNextEmail functionality? (requires SMTP server)} {true false} false
205 ;; The email module requires some configuration. It needs an SMTP 213 ;; The email module requires some configuration. It needs an SMTP
206 ;; server to send mail through. 214 ;; server to send mail through.
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index d6eee0e..f857b8d 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