maybe this is a better way...

This commit is contained in:
UbitUmarov
2022-12-10 19:26:36 +00:00
parent 922f4ca66c
commit b62280617d
10 changed files with 8 additions and 22 deletions

View File

@@ -81,7 +81,7 @@ namespace OpenSim.Data.SQLite
/// <param name="dbconnect">connect string</param>
override public void Initialise(string dbconnect)
{
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteAssetData).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
if (dbconnect.Length == 0)
{

View File

@@ -65,7 +65,7 @@ namespace OpenSim.Data.SQLite
if (!m_initialized)
{
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteAuthenticationData).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
m_Connection = new SqliteConnection(connectionString);
m_Connection.Open();

View File

@@ -69,7 +69,7 @@ namespace OpenSim.Data.SQLite
public void Initialise(string connectionString)
{
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteEstateStore).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
m_connectionString = connectionString;

View File

@@ -48,7 +48,7 @@ namespace OpenSim.Data.SQLite
protected SQLiteFramework(string connectionString)
{
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteFramework).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
}
//////////////////////////////////////////////////////////////

View File

@@ -113,7 +113,7 @@ namespace OpenSim.Data.SQLite
{
try
{
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteSimulationData).Assembly);
DllmapConfigHelper. RegisterAssembly(typeof(SqliteConnection).Assembly);
m_connectionString = connectionString;

View File

@@ -69,7 +69,7 @@ namespace OpenSim.Data.SQLite
public void Initialise(string connectionString)
{
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteUserProfilesData).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
m_connectionString = connectionString;

View File

@@ -52,7 +52,7 @@ namespace OpenSim.Data.SQLite
public SQLiteXInventoryData(string conn, string realm)
{
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteXInventoryData).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
m_Folders = new SqliteFolderHandler(
conn, "inventoryfolders", "XInventoryStore");

View File

@@ -91,7 +91,7 @@ namespace OpenSim.Region.UserStatistics
if (!enabled)
return;
DllmapConfigHelper.RegisterAssembly(typeof(WebStatsModule).Assembly);
DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
//IConfig startupConfig = config.Configs["Startup"];

View File

@@ -1,7 +0,0 @@
<configuration>
<dllmap os="windows" cpu="x86-64" dll="sqlite3" target="lib64/sqlite3.dll" />
<dllmap os="windows" cpu="x86" dll="sqlite3" target="lib32/sqlite3.dll" />
<dllmap os="osx" cpu="x86,x86-64" dll="sqlite3" target="lib64/libsqlite3.dylib" />
<dllmap os="!windows,osx" cpu="x86-64" dll="sqlite3" target="lib64/libsqlite3_64.so" />
<dllmap os="!windows,osx" cpu="x86" dll="sqlite3" target="lib32/libsqlite3_32.so" />
</configuration>

View File

@@ -1,7 +0,0 @@
<configuration>
<dllmap os="windows" cpu="x86-64" dll="sqlite3" target="lib64/sqlite3.dll" />
<dllmap os="windows" cpu="x86" dll="sqlite3" target="lib32/sqlite3.dll" />
<dllmap os="osx" cpu="x86,x86-64" dll="sqlite3" target="lib64/libsqlite3.dylib" />
<dllmap os="!windows,osx" cpu="x86-64" dll="sqlite3" target="lib64/libsqlite3_64.so" />
<dllmap os="!windows,osx" cpu="x86" dll="sqlite3" target="lib32/libsqlite3_32.so" />
</configuration>