* 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

4 files changed, 8 insertions, 2 deletions

diff --git a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs
index 8b8172e..9a60b53 100644
--- a/OpenSim/Framework/Communications/Cache/FileAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/FileAssetClient.cs
@@ -43,6 +43,7 @@ namespace OpenSim.Framework.Communications.Cache
             }
             m_dir = dir;
         }
+        
         public override void StoreAsset(AssetBase asset)
         {
             byte[] idBytes = asset.Metadata.FullID.Guid.ToByteArray();
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);
             }
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
index 76d06cb..00237b3 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
@@ -495,6 +495,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
                     m_commander.ProcessConsoleCommand("help", new string[0]);
                     return;
                 }
+                
                 string[] tmpArgs = new string[args.Length - 2];
                 int i;
                 for (i = 2; i < args.Length; i++)