diff options
| author | Mic Bowman | 2011-08-19 14:49:16 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-19 14:49:16 -0700 |
| commit | 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch) | |
| tree | 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /bin/config-include/GridCommon.ini.example | |
| parent | BulletSim: add runtime setting of physics parameters. Update default values. (diff) | |
| parent | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff) | |
| download | opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz | |
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'bin/config-include/GridCommon.ini.example')
| -rw-r--r-- | bin/config-include/GridCommon.ini.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 4e34059..c5598c0 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
| @@ -122,6 +122,7 @@ | |||
| 122 | [Modules] | 122 | [Modules] |
| 123 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. | 123 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. |
| 124 | ;; Copy the config .example file into your own .ini file and change configs there | 124 | ;; Copy the config .example file into your own .ini file and change configs there |
| 125 | ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained. | ||
| 125 | 126 | ||
| 126 | AssetCaching = "FlotsamAssetCache" | 127 | AssetCaching = "FlotsamAssetCache" |
| 127 | Include-FlotsamCache = "config-include/FlotsamCache.ini" | 128 | Include-FlotsamCache = "config-include/FlotsamCache.ini" |