* Change opensim.ini.example guidance on asset_database setting to be "local" or "grid"

* See OpenSim.ini.example for more details
* The old sqlite/mssql settings were redundant and effectively ignored anyway.  Hence, there's no need for you to change your current settings, which will still work
* In fact, asset_database should probably be moved to [Network] since it's meaningless for standalone installations

2 files changed, 11 insertions, 14 deletions

diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index fd3a57f..1b8ed45 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -94,7 +94,7 @@ namespace OpenSim
         private string m_standaloneAssetPlugin;
         private string m_standaloneUserPlugin;
 
-        private string m_assetStorage = "sqlite";
+        private string m_assetStorage = "local";
 
         private string m_timedScript = "disabled";
         private Timer m_scriptTimer;
@@ -278,7 +278,7 @@ namespace OpenSim
                 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
 
                 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
-                m_assetStorage = startupConfig.GetString("asset_database", "sqlite");
+                m_assetStorage = startupConfig.GetString("asset_database", "local");
 
                 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
             }
@@ -429,13 +429,6 @@ namespace OpenSim
             {
                 assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
             }
-            else if (m_assetStorage == "mssql")
-            {
-                SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll");
-                sqlAssetServer.LoadDefaultAssets();
-                assetServer = sqlAssetServer;
-                //assetServer = new GridAssetClient(String.Empty);
-            }
             else
             {
                 SQLAssetServer sqlAssetServer = new SQLAssetServer(m_standaloneAssetPlugin);
@@ -444,7 +437,6 @@ namespace OpenSim
             }
 
             m_assetCache = new AssetCache(assetServer);
-            // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
 
             m_sceneManager.OnRestartSim += handleRestartRegion;
         }
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 0e0056c..f7fb61f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -32,11 +32,16 @@ storage_prim_inventories = true
 appearance_persist = false
 appearance_connection_string = "Data Source=localhost;Database=avatar_appearance;User ID=root;Password=xxxx;pooling=false;"
 
-; Select the type of database to use for asset storage
-;asset_database = "db4o"
-asset_database = "sqlite"
+; Select whether you want to use local or grid asset storage.
+;
+; If you're running in standalone, you definitely want local, since there is no grid (hence this is redundant, and should
+; really be eliminated).  The database itself is defined in asset_plugin below
+;
+; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the 
+; grid asset server.  If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets
+; locally.  This will mean you won't be able to take items using your assets to other people's regions.
+asset_database = "local"
 ;asset_database = "grid"
-;asset_database = "mssql"
 
 ; Should avatars in neighbor sims see objects in this sim?
 see_into_this_sim_from_neighbor = True