aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorBlueWall2011-04-13 17:03:30 -0400
committerBlueWall2011-04-13 17:03:30 -0400
commitc0fcc430fe12184038f0d46f992d507885295834 (patch)
treedcc517adcc10049054a4fe2b02aac3182c78db49 /bin
parentremove packet monitoring debugging code (diff)
parentAdd ColladaMesh switch (diff)
downloadopensim-SC-c0fcc430fe12184038f0d46f992d507885295834.zip
opensim-SC-c0fcc430fe12184038f0d46f992d507885295834.tar.gz
opensim-SC-c0fcc430fe12184038f0d46f992d507885295834.tar.bz2
opensim-SC-c0fcc430fe12184038f0d46f992d507885295834.tar.xz
Merge branch 'master' of /home/git/repo/OpenSim into queuetest
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example10
-rw-r--r--bin/OpenSimDefaults.ini15
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 @@
16;; files are loaded then type "config show" on the region console command line. 16;; files are loaded then type "config show" on the region console command line.
17;; 17;;
18;; 18;;
19;; NOTES FOR DEVELOPERS REGARDING FORMAT OF TIHS FILE 19;; NOTES FOR DEVELOPERS REGARDING THE FORMAT OF THIS FILE
20;; 20;;
21;; All leading white space is ignored, but preserved. 21;; All leading white space is ignored, but preserved.
22;; 22;;
@@ -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..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