aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorDiva Canto2011-01-08 15:50:25 -0800
committerDiva Canto2011-01-08 15:50:25 -0800
commit9d9a170571574292b085d075fd80966c7aba40e3 (patch)
treee3a829a8270036596676132d8181ce42bed9dbc5 /bin/OpenSimDefaults.ini
parentFixes the issue of hung archives. Problem was with SceneObjectSerializer. (diff)
parentMerge branch 'cmickeyb' (diff)
downloadopensim-SC_OLD-9d9a170571574292b085d075fd80966c7aba40e3.zip
opensim-SC_OLD-9d9a170571574292b085d075fd80966c7aba40e3.tar.gz
opensim-SC_OLD-9d9a170571574292b085d075fd80966c7aba40e3.tar.bz2
opensim-SC_OLD-9d9a170571574292b085d075fd80966c7aba40e3.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini8
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8437ece..9028453 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1240,6 +1240,14 @@
1240 ; Enable media on a prim facilities 1240 ; Enable media on a prim facilities
1241 Enabled = true; 1241 Enabled = true;
1242 1242
1243;;
1244;; If you are using a simian grid frontend you can enable
1245;; this module to upload tile images for the mapping fn
1246;;
1247[SimianGridMaptiles]
1248 Enabled = False
1249 MaptileURL = "http://www.mygrid.com/Grid/"
1250 RefreshTime = 3600
1243 1251
1244;; 1252;;
1245;; These are defaults that are overwritten below in [Architecture]. 1253;; These are defaults that are overwritten below in [Architecture].