diff options
| author | Justin Clark-Casey (justincc) | 2012-02-24 23:35:47 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-24 23:35:59 +0000 |
| commit | dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a (patch) | |
| tree | 60020a679a229d078ce3be2f933025c81c677d74 /OpenSim/Data/SQLite/SQLiteAssetData.cs | |
| parent | Amend to last commit: synchronize access to queues. (diff) | |
| parent | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http:... (diff) | |
| download | opensim-SC-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.zip opensim-SC-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.gz opensim-SC-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.bz2 opensim-SC-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.xz | |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index bb23fc1..d0e24c3 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
| @@ -81,6 +81,9 @@ namespace OpenSim.Data.SQLite | |||
| 81 | /// <param name="dbconnect">connect string</param> | 81 | /// <param name="dbconnect">connect string</param> |
| 82 | override public void Initialise(string dbconnect) | 82 | override public void Initialise(string dbconnect) |
| 83 | { | 83 | { |
| 84 | if (Util.IsWindows()) | ||
| 85 | Util.LoadArchSpecificWindowsDll("sqlite3.dll"); | ||
| 86 | |||
| 84 | if (dbconnect == string.Empty) | 87 | if (dbconnect == string.Empty) |
| 85 | { | 88 | { |
| 86 | dbconnect = "URI=file:Asset.db,version=3"; | 89 | dbconnect = "URI=file:Asset.db,version=3"; |