diff options
author | MW | 2007-09-10 06:45:54 +0000 |
---|---|---|
committer | MW | 2007-09-10 06:45:54 +0000 |
commit | 15423539f98d47201a819e35f80b0c30ee459556 (patch) | |
tree | 3eb7831bfaaf5e0309c49f966d19869a9fe72e2b /OpenSim/Region/Application | |
parent | * Fixed: Accessing xmlrpc with invalid xml data would crash the sim. (diff) | |
download | opensim-SC-15423539f98d47201a819e35f80b0c30ee459556.zip opensim-SC-15423539f98d47201a819e35f80b0c30ee459556.tar.gz opensim-SC-15423539f98d47201a819e35f80b0c30ee459556.tar.bz2 opensim-SC-15423539f98d47201a819e35f80b0c30ee459556.tar.xz |
hooked up sdague new sqlite asset database provider to the old asset system. So we can still use sqlite for assets while we wait for the rest of the new asset system to be wrote.
Needs more testing, so if it causes problems will have to swap back to db4o.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 9e0bc09..8437933 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -266,7 +266,8 @@ namespace OpenSim | |||
266 | { | 266 | { |
267 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; | 267 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; |
268 | 268 | ||
269 | LocalAssetServer assetServer = new LocalAssetServer(); | 269 | // LocalAssetServer assetServer = new LocalAssetServer(); |
270 | SQLAssetServer assetServer = new SQLAssetServer(); | ||
270 | assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 271 | assetServer.SetServerInfo(m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); |
271 | m_assetCache = new AssetCache(assetServer); | 272 | m_assetCache = new AssetCache(assetServer); |
272 | // m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 273 | // m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); |