diff options
| author | Melanie | 2013-02-08 23:29:47 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-08 23:29:47 +0000 |
| commit | 12971e73d40d5962fb7f902d086f6c10b995b220 (patch) | |
| tree | 645bbe2aed0dad1df760fda57ad0ca7da2463b3b /bin/OpenSimDefaults.ini | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-12971e73d40d5962fb7f902d086f6c10b995b220.zip opensim-SC-12971e73d40d5962fb7f902d086f6c10b995b220.tar.gz opensim-SC-12971e73d40d5962fb7f902d086f6c10b995b220.tar.bz2 opensim-SC-12971e73d40d5962fb7f902d086f6c10b995b220.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 6409cdb..e2d952a 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1648,6 +1648,10 @@ | |||
| 1648 | [JsonStore] | 1648 | [JsonStore] |
| 1649 | Enabled = False | 1649 | Enabled = False |
| 1650 | 1650 | ||
| 1651 | ;; Enable direct access to the SOP dynamic attributes | ||
| 1652 | EnableObjectStore = False | ||
| 1653 | MaxStringSpace = 0 | ||
| 1654 | |||
| 1651 | ;; | 1655 | ;; |
| 1652 | ;; These are defaults that are overwritten below in [Architecture]. | 1656 | ;; These are defaults that are overwritten below in [Architecture]. |
| 1653 | ;; These defaults allow OpenSim to work out of the box with | 1657 | ;; These defaults allow OpenSim to work out of the box with |