aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorDiva Canto2011-12-23 10:58:55 -0800
committerDiva Canto2011-12-23 10:58:55 -0800
commitd38b8caf2bdd7a2850cacc60d783493f56592ec3 (patch)
tree83fb0496fd46501bc80cb4e10505d5db921bf4dd /bin/OpenSimDefaults.ini
parentHG: AAdded a few missing /'s at the end of URLs (diff)
parentremove the old region crossing handler (diff)
downloadopensim-SC_OLD-d38b8caf2bdd7a2850cacc60d783493f56592ec3.zip
opensim-SC_OLD-d38b8caf2bdd7a2850cacc60d783493f56592ec3.tar.gz
opensim-SC_OLD-d38b8caf2bdd7a2850cacc60d783493f56592ec3.tar.bz2
opensim-SC_OLD-d38b8caf2bdd7a2850cacc60d783493f56592ec3.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 972efe4..3e7f8a6 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -181,6 +181,11 @@
181 ; ## PHYSICS 181 ; ## PHYSICS
182 ; ## 182 ; ##
183 183
184 ; If true then prims can be collided with by avatars, other prims, etc.
185 ; If false then all prims are phantom, no matter whether their phantom flag is checked or unchecked.
186 ; Also, no prims are subject to physics.
187 collidable_prim = true
188
184 ; If true then prims can be made subject to physics (gravity, pushing, etc.). 189 ; If true then prims can be made subject to physics (gravity, pushing, etc.).
185 ; If false then physics flag can be set but it is not honoured. However, prims are still solid for the purposes of collision direction 190 ; If false then physics flag can be set but it is not honoured. However, prims are still solid for the purposes of collision direction
186 physical_prim = true 191 physical_prim = true