diff options
Merge branch 'master' into careminster
Conflicts:
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteFramework.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteFramework.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs index 4992bcc..1594717 100644 --- a/OpenSim/Data/SQLite/SQLiteFramework.cs +++ b/OpenSim/Data/SQLite/SQLiteFramework.cs | |||
| @@ -48,6 +48,8 @@ namespace OpenSim.Data.SQLite | |||
| 48 | 48 | ||
| 49 | protected SQLiteFramework(string connectionString) | 49 | protected SQLiteFramework(string connectionString) |
| 50 | { | 50 | { |
| 51 | if (Util.IsWindows()) | ||
| 52 | Util.LoadArchSpecificWindowsDll("sqlite3.dll"); | ||
| 51 | } | 53 | } |
| 52 | 54 | ||
| 53 | ////////////////////////////////////////////////////////////// | 55 | ////////////////////////////////////////////////////////////// |