diff options
| author | Sean Dague | 2008-04-23 19:13:06 +0000 |
|---|---|---|
| committer | Sean Dague | 2008-04-23 19:13:06 +0000 |
| commit | a1cc0e436ff9081f3c0a76de861ed0673cd36142 (patch) | |
| tree | 31d775f3e17109b5b6765e89b73da9f036172328 /OpenSim/Region | |
| parent | * Fix a console issue where pressing return on some operating systems cause t... (diff) | |
| download | opensim-SC-a1cc0e436ff9081f3c0a76de861ed0673cd36142.zip opensim-SC-a1cc0e436ff9081f3c0a76de861ed0673cd36142.tar.gz opensim-SC-a1cc0e436ff9081f3c0a76de861ed0673cd36142.tar.bz2 opensim-SC-a1cc0e436ff9081f3c0a76de861ed0673cd36142.tar.xz | |
changes to allow asset_source to be specified in the opensim.ini
this will work for sqlite and nhibernate, but will be ignored for
mysql and mssql (reverting to their ini files) until someone writes
that bit.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index ad0ee45..c01fc5a 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
| @@ -454,7 +454,7 @@ namespace OpenSim | |||
| 454 | } | 454 | } |
| 455 | else | 455 | else |
| 456 | { | 456 | { |
| 457 | SQLAssetServer sqlAssetServer = new SQLAssetServer(m_standaloneAssetPlugin); | 457 | SQLAssetServer sqlAssetServer = new SQLAssetServer(m_standaloneAssetPlugin, m_standaloneAssetSource); |
| 458 | sqlAssetServer.LoadDefaultAssets(); | 458 | sqlAssetServer.LoadDefaultAssets(); |
| 459 | assetServer = sqlAssetServer; | 459 | assetServer = sqlAssetServer; |
| 460 | } | 460 | } |