aboutsummaryrefslogtreecommitdiffstatshomepage
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
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 '')
-rw-r--r--OpenSim/Framework/Communications/Cache/FileAssetClient.cs1
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs1
-rw-r--r--bin/OpenSim.ini.example13
5 files changed, 19 insertions, 4 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
43 } 43 }
44 m_dir = dir; 44 m_dir = dir;
45 } 45 }
46
46 public override void StoreAsset(AssetBase asset) 47 public override void StoreAsset(AssetBase asset)
47 { 48 {
48 byte[] idBytes = asset.Metadata.FullID.Guid.ToByteArray(); 49 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
200 config.Set("startup_console_commands_file", String.Empty); 200 config.Set("startup_console_commands_file", String.Empty);
201 config.Set("shutdown_console_commands_file", String.Empty); 201 config.Set("shutdown_console_commands_file", String.Empty);
202 config.Set("DefaultScriptEngine", "XEngine"); 202 config.Set("DefaultScriptEngine", "XEngine");
203 config.Set("asset_database", "local"); 203 config.Set("asset_database", "default");
204 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 204 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
205 // life doesn't really work without this 205 // life doesn't really work without this
206 config.Set("EventQueue", true); 206 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
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 }
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
495 m_commander.ProcessConsoleCommand("help", new string[0]); 495 m_commander.ProcessConsoleCommand("help", new string[0]);
496 return; 496 return;
497 } 497 }
498
498 string[] tmpArgs = new string[args.Length - 2]; 499 string[] tmpArgs = new string[args.Length - 2];
499 int i; 500 int i;
500 for (i = 2; i < args.Length; i++) 501 for (i = 2; i < args.Length; i++)
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 532a710..481cbbf 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -91,8 +91,17 @@
91 ; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the 91 ; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the
92 ; grid asset server. If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets 92 ; grid asset server. If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets
93 ; locally. This will mean you won't be able to take items using your assets to other people's regions. 93 ; locally. This will mean you won't be able to take items using your assets to other people's regions.
94 asset_database = "local" 94
95 ;asset_database = "grid" 95 ; asset_database can be default, local or grid. This controls where assets (textures, scripts, etc.) are stored for your region
96 ;
97 ; If set to default, then
98 ; In standalone mode the local database based asset service will be used
99 ; In grid mode the grid asset service will be used for asset storage
100 ; This is probably the setting that you want.
101 ;
102 ; If set to local then the local database based asset service will be used in standalone and grid modes
103 ; If set to grid then the grid based asset service will be used in standalone and grid modes
104 asset_database = "default"
96 105
97 ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to 106 ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
98 ; prevent frequently changing objects from heavily loading the region data store. 107 ; prevent frequently changing objects from heavily loading the region data store.