* 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

2 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 7ee4062..3492a19 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -200,7 +200,7 @@ namespace OpenSim
                 config.Set("startup_console_commands_file", String.Empty);
                 config.Set("shutdown_console_commands_file", String.Empty);
                 config.Set("DefaultScriptEngine", "XEngine");
-                config.Set("asset_database", "local");
+                config.Set("asset_database", "default");
                 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
                 // life doesn't really work without this
                 config.Set("EventQueue", true);
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
         /// </summary>
         protected virtual void InitialiseAssetCache()
         {
+            // If the assetcache is set to default, then use the grid asset service in grid mode and the local database
+            // based asset service in standalone mode
+            
             IAssetServer assetServer;
-            if (m_configSettings.AssetStorage == "grid")
+            if (m_configSettings.AssetStorage == "grid" 
+                || (m_configSettings.AssetStorage == "default" && false == m_configSettings.Standalone))
             {
                 assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
             }