diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs | 1 |
3 files changed, 7 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 | |||
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++) |