diff options
| author | Justin Clark-Casey (justincc) | 2012-04-18 00:00:09 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-04-18 00:00:09 +0100 |
| commit | b430c0162c32308bf4dd0358b40b5aa8ab32b4fb (patch) | |
| tree | 83c34133038ce7bc3688eb6675078b06a76aaa90 /bin/OpenSimDefaults.ini | |
| parent | minor: Add some method doc. Add warnings since calling SOG link/delink metho... (diff) | |
| parent | clean up some more logging spam in the jsonstore modules (diff) | |
| download | opensim-SC_OLD-b430c0162c32308bf4dd0358b40b5aa8ab32b4fb.zip opensim-SC_OLD-b430c0162c32308bf4dd0358b40b5aa8ab32b4fb.tar.gz opensim-SC_OLD-b430c0162c32308bf4dd0358b40b5aa8ab32b4fb.tar.bz2 opensim-SC_OLD-b430c0162c32308bf4dd0358b40b5aa8ab32b4fb.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 68a2ea3..3f2f131 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1561,6 +1561,12 @@ | |||
| 1561 | RefreshTime = 3600 | 1561 | RefreshTime = 3600 |
| 1562 | 1562 | ||
| 1563 | ;; | 1563 | ;; |
| 1564 | ;; JsonStore module provides structured store for scripts | ||
| 1565 | ;; | ||
| 1566 | [JsonStore] | ||
| 1567 | Enabled = False | ||
| 1568 | |||
| 1569 | ;; | ||
| 1564 | ;; These are defaults that are overwritten below in [Architecture]. | 1570 | ;; These are defaults that are overwritten below in [Architecture]. |
| 1565 | ;; These defaults allow OpenSim to work out of the box with | 1571 | ;; These defaults allow OpenSim to work out of the box with |
| 1566 | ;; zero configuration | 1572 | ;; zero configuration |