aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-04 18:56:12 +0000
committerJustin Clarke Casey2009-02-04 18:56:12 +0000
commita1da6057066b2dadfa96ddb2f64df83a0b246ee4 (patch)
tree33c308858320e78e8bccf0a1c5bf4355bd87411e /OpenSim/Region/Application/OpenSimBase.cs
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-a1da6057066b2dadfa96ddb2f64df83a0b246ee4.zip
opensim-SC_OLD-a1da6057066b2dadfa96ddb2f64df83a0b246ee4.tar.gz
opensim-SC_OLD-a1da6057066b2dadfa96ddb2f64df83a0b246ee4.tar.bz2
opensim-SC_OLD-a1da6057066b2dadfa96ddb2f64df83a0b246ee4.tar.xz
* Introduce a new "default" option for asset_database in the [STORAGE] section
* This option makes OpenSim use the usual db based asset service in standalone, and the grid based one in grid mode * The other options can (local, grid, etc) can still be used explicitly as before * Also change OpenSim.ini.example and the surrounding explanative text
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index e3a81d1..ec40384 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -269,8 +269,12 @@ namespace OpenSim
269 /// </summary> 269 /// </summary>
270 protected virtual void InitialiseAssetCache() 270 protected virtual void InitialiseAssetCache()
271 { 271 {
272 // If the assetcache is set to default, then use the grid asset service in grid mode and the local database
273 // based asset service in standalone mode
274
272 IAssetServer assetServer; 275 IAssetServer assetServer;
273 if (m_configSettings.AssetStorage == "grid") 276 if (m_configSettings.AssetStorage == "grid"
277 || (m_configSettings.AssetStorage == "default" && false == m_configSettings.Standalone))
274 { 278 {
275 assetServer = new GridAssetClient(m_networkServersInfo.AssetURL); 279 assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
276 } 280 }