aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-13 01:01:28 +0000
committerJustin Clarke Casey2008-03-13 01:01:28 +0000
commit297887e1fc233ddfa2640aebd3432dbabe8f6ad8 (patch)
tree154f5a9be1d74492fbc811d1faa54e05ed59dcc7
parent* Change opensim.ini.example to flesh out database *_plugin options (diff)
downloadopensim-SC_OLD-297887e1fc233ddfa2640aebd3432dbabe8f6ad8.zip
opensim-SC_OLD-297887e1fc233ddfa2640aebd3432dbabe8f6ad8.tar.gz
opensim-SC_OLD-297887e1fc233ddfa2640aebd3432dbabe8f6ad8.tar.bz2
opensim-SC_OLD-297887e1fc233ddfa2640aebd3432dbabe8f6ad8.tar.xz
* 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
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs12
-rw-r--r--bin/OpenSim.ini.example13
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
94 private string m_standaloneAssetPlugin; 94 private string m_standaloneAssetPlugin;
95 private string m_standaloneUserPlugin; 95 private string m_standaloneUserPlugin;
96 96
97 private string m_assetStorage = "sqlite"; 97 private string m_assetStorage = "local";
98 98
99 private string m_timedScript = "disabled"; 99 private string m_timedScript = "disabled";
100 private Timer m_scriptTimer; 100 private Timer m_scriptTimer;
@@ -278,7 +278,7 @@ namespace OpenSim
278 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); 278 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty);
279 279
280 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 280 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
281 m_assetStorage = startupConfig.GetString("asset_database", "sqlite"); 281 m_assetStorage = startupConfig.GetString("asset_database", "local");
282 282
283 m_timedScript = startupConfig.GetString("timer_Script", "disabled"); 283 m_timedScript = startupConfig.GetString("timer_Script", "disabled");
284 } 284 }
@@ -429,13 +429,6 @@ namespace OpenSim
429 { 429 {
430 assetServer = new GridAssetClient(m_networkServersInfo.AssetURL); 430 assetServer = new GridAssetClient(m_networkServersInfo.AssetURL);
431 } 431 }
432 else if (m_assetStorage == "mssql")
433 {
434 SQLAssetServer sqlAssetServer = new SQLAssetServer("OpenSim.Framework.Data.MSSQL.dll");
435 sqlAssetServer.LoadDefaultAssets();
436 assetServer = sqlAssetServer;
437 //assetServer = new GridAssetClient(String.Empty);
438 }
439 else 432 else
440 { 433 {
441 SQLAssetServer sqlAssetServer = new SQLAssetServer(m_standaloneAssetPlugin); 434 SQLAssetServer sqlAssetServer = new SQLAssetServer(m_standaloneAssetPlugin);
@@ -444,7 +437,6 @@ namespace OpenSim
444 } 437 }
445 438
446 m_assetCache = new AssetCache(assetServer); 439 m_assetCache = new AssetCache(assetServer);
447 // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey);
448 440
449 m_sceneManager.OnRestartSim += handleRestartRegion; 441 m_sceneManager.OnRestartSim += handleRestartRegion;
450 } 442 }
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
32appearance_persist = false 32appearance_persist = false
33appearance_connection_string = "Data Source=localhost;Database=avatar_appearance;User ID=root;Password=xxxx;pooling=false;" 33appearance_connection_string = "Data Source=localhost;Database=avatar_appearance;User ID=root;Password=xxxx;pooling=false;"
34 34
35; Select the type of database to use for asset storage 35; Select whether you want to use local or grid asset storage.
36;asset_database = "db4o" 36;
37asset_database = "sqlite" 37; If you're running in standalone, you definitely want local, since there is no grid (hence this is redundant, and should
38; really be eliminated). The database itself is defined in asset_plugin below
39;
40; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the
41; grid asset server. If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets
42; locally. This will mean you won't be able to take items using your assets to other people's regions.
43asset_database = "local"
38;asset_database = "grid" 44;asset_database = "grid"
39;asset_database = "mssql"
40 45
41; Should avatars in neighbor sims see objects in this sim? 46; Should avatars in neighbor sims see objects in this sim?
42see_into_this_sim_from_neighbor = True 47see_into_this_sim_from_neighbor = True