aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMic Bowman2011-01-08 13:33:52 -0800
committerMic Bowman2011-01-08 13:33:52 -0800
commitec225600458b37b077005a92db1e213d7715a504 (patch)
tree088b78387299ef8296edd1acf6123cfbddb660dd /bin
parentTry to fix a IAR problem reported by nebadon, where save iar seems stuck fore... (diff)
parentMoved the map tile processing used by the Simian Grid (diff)
downloadopensim-SC_OLD-ec225600458b37b077005a92db1e213d7715a504.zip
opensim-SC_OLD-ec225600458b37b077005a92db1e213d7715a504.tar.gz
opensim-SC_OLD-ec225600458b37b077005a92db1e213d7715a504.tar.bz2
opensim-SC_OLD-ec225600458b37b077005a92db1e213d7715a504.tar.xz
Merge branch 'cmickeyb'
Diffstat (limited to 'bin')
-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].