diff options
| author | Justin Clark-Casey (justincc) | 2010-02-05 19:21:27 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-02-05 19:21:27 +0000 |
| commit | 68bb2dac45d7ce0d280cdfa66de3d142bb05c8cc (patch) | |
| tree | 93fd9269b3bd763f1b9739f54db03a429b142818 /OpenSim/Region | |
| parent | Old OpenSim installations may have no AssetCaching setting in config-include/... (diff) | |
| download | opensim-SC-68bb2dac45d7ce0d280cdfa66de3d142bb05c8cc.zip opensim-SC-68bb2dac45d7ce0d280cdfa66de3d142bb05c8cc.tar.gz opensim-SC-68bb2dac45d7ce0d280cdfa66de3d142bb05c8cc.tar.bz2 opensim-SC-68bb2dac45d7ce0d280cdfa66de3d142bb05c8cc.tar.xz | |
Revert "Old OpenSim installations may have no AssetCaching setting in config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)"
This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules)
This reverts commit 7058a4c2597a2b76704e906b73ae7077ff805b16.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs index e0e4cc6..1add0ab 100644 --- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | |||
| @@ -324,9 +324,7 @@ namespace OpenSim.Region.CoreModules.Asset | |||
| 324 | if (moduleConfig == null) | 324 | if (moduleConfig == null) |
| 325 | return; | 325 | return; |
| 326 | 326 | ||
| 327 | // We're going to make CenomeAssetCache the default if there is no AssetCaching setting at all. This | 327 | string name = moduleConfig.GetString("AssetCaching"); |
| 328 | // matches the default StandaloneCommon.ini.example | ||
| 329 | string name = moduleConfig.GetString("AssetCaching", Name); | ||
| 330 | //Log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); | 328 | //Log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name); |
| 331 | 329 | ||
| 332 | if (name != Name) | 330 | if (name != Name) |