aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorMelanie2010-08-06 17:47:55 +0100
committerMelanie2010-08-06 17:47:55 +0100
commit1cd441d5de0e19aac230e3bc8eac211662f209b5 (patch)
tree6b6a69e755fd72d894f8b3742efde6189883570e /bin/OpenSim.ini.example
parentFixes: llSetLinkPrimitiveParams - PRIM_POSITION is not relative to root, caus... (diff)
parentMerge branch 'moap' (diff)
downloadopensim-SC_OLD-1cd441d5de0e19aac230e3bc8eac211662f209b5.zip
opensim-SC_OLD-1cd441d5de0e19aac230e3bc8eac211662f209b5.tar.gz
opensim-SC_OLD-1cd441d5de0e19aac230e3bc8eac211662f209b5.tar.bz2
opensim-SC_OLD-1cd441d5de0e19aac230e3bc8eac211662f209b5.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r--bin/OpenSim.ini.example5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 5dcc601..54c013a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1245,6 +1245,11 @@
1245; enabled=false 1245; enabled=false
1246 1246
1247 1247
1248[MediaOnAPrim]
1249 ; Enable media on a prim facilities
1250 Enabled = true;
1251
1252
1248;; 1253;;
1249;; These are defaults that are overwritten below in [Architecture]. 1254;; These are defaults that are overwritten below in [Architecture].
1250;; These defaults allow OpenSim to work out of the box with 1255;; These defaults allow OpenSim to work out of the box with