aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:53:53 +0100
committerMelanie2011-10-25 01:53:53 +0100
commit8841b77cd1c72f0a43483a8a9c7dadb5e25604a2 (patch)
treeb067bb231a66705ecd1f2c675a602725b0cbc2c6 /bin
parentMerge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge (diff)
parentRestore [Startup] physical_prim flag which can stop any prims being subject t... (diff)
downloadopensim-SC_OLD-8841b77cd1c72f0a43483a8a9c7dadb5e25604a2.zip
opensim-SC_OLD-8841b77cd1c72f0a43483a8a9c7dadb5e25604a2.tar.gz
opensim-SC_OLD-8841b77cd1c72f0a43483a8a9c7dadb5e25604a2.tar.bz2
opensim-SC_OLD-8841b77cd1c72f0a43483a8a9c7dadb5e25604a2.tar.xz
Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 962b736..cda5c97 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -177,7 +177,8 @@
177 ; ## PHYSICS 177 ; ## PHYSICS
178 ; ## 178 ; ##
179 179
180 ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true. 180 ; If true then prims can be made subject to physics (gravity, pushing, etc.).
181 ; If false then physics flag can be set but it is not honoured. However, prims are still solid for the purposes of collision direction
181 physical_prim = true 182 physical_prim = true
182 183
183 ; Select a mesher here. 184 ; Select a mesher here.