diff options
author | Mike Mazur | 2009-02-16 02:28:00 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-16 02:28:00 +0000 |
commit | ef19d32a39f29cd11e608464ef6a49a45a52e12d (patch) | |
tree | 51e789273abc4b1c4376a8ee18e3167f19bba95d | |
parent | Fix dependency on non-OpenSim version of OpenMetaverse.StructuredData.dll. (diff) | |
download | opensim-SC_OLD-ef19d32a39f29cd11e608464ef6a49a45a52e12d.zip opensim-SC_OLD-ef19d32a39f29cd11e608464ef6a49a45a52e12d.tar.gz opensim-SC_OLD-ef19d32a39f29cd11e608464ef6a49a45a52e12d.tar.bz2 opensim-SC_OLD-ef19d32a39f29cd11e608464ef6a49a45a52e12d.tar.xz |
- remove dependency on OpenSim.Grid.AssetServer.Plugins.Opensim in
OpenSim.Data.*.addin.xml, this is cruft left over from previous
testing
- fix example SQLite connection string in
AssetInventoryServer.ini.example
4 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml b/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml index 3509034..15fd29e 100644 --- a/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml +++ b/OpenSim/Data/MSSQL/Resources/OpenSim.Data.MSSQL.addin.xml | |||
@@ -4,7 +4,6 @@ | |||
4 | </Runtime> | 4 | </Runtime> |
5 | <Dependencies> | 5 | <Dependencies> |
6 | <Addin id="OpenSim.Data" version="0.5" /> | 6 | <Addin id="OpenSim.Data" version="0.5" /> |
7 | <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" /> | ||
8 | </Dependencies> | 7 | </Dependencies> |
9 | <Extension path = "/OpenSim/GridData"> | 8 | <Extension path = "/OpenSim/GridData"> |
10 | <Plugin id="MSSQLGridData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" /> | 9 | <Plugin id="MSSQLGridData" provider="OpenSim.Data.MSSQL.dll" type="OpenSim.Data.MSSQL.MSSQLGridData" /> |
diff --git a/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml b/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml index 6b8e87b..37b23cb 100644 --- a/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml +++ b/OpenSim/Data/NHibernate/Resources/OpenSim.Data.NHibernate.addin.xml | |||
@@ -4,7 +4,6 @@ | |||
4 | </Runtime> | 4 | </Runtime> |
5 | <Dependencies> | 5 | <Dependencies> |
6 | <Addin id="OpenSim.Data" version="0.5" /> | 6 | <Addin id="OpenSim.Data" version="0.5" /> |
7 | <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" /> | ||
8 | </Dependencies> | 7 | </Dependencies> |
9 | <Extension path = "/OpenSim/GridData"> | 8 | <Extension path = "/OpenSim/GridData"> |
10 | <Plugin id="NHibernateGridData" provider="OpenSim.Data.NHibernate.dll" type="OpenSim.Data.NHibernate.NHibernateGridData" /> | 9 | <Plugin id="NHibernateGridData" provider="OpenSim.Data.NHibernate.dll" type="OpenSim.Data.NHibernate.NHibernateGridData" /> |
diff --git a/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml b/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml index 256ef41..e6764fa 100644 --- a/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml +++ b/OpenSim/Data/SQLite/Resources/OpenSim.Data.SQLite.addin.xml | |||
@@ -4,7 +4,6 @@ | |||
4 | </Runtime> | 4 | </Runtime> |
5 | <Dependencies> | 5 | <Dependencies> |
6 | <Addin id="OpenSim.Data" version="0.5" /> | 6 | <Addin id="OpenSim.Data" version="0.5" /> |
7 | <Addin id="OpenSim.Grid.AssetServer.Plugins.OpenSim" version="0.1" /> | ||
8 | </Dependencies> | 7 | </Dependencies> |
9 | <Extension path = "/OpenSim/GridData"> | 8 | <Extension path = "/OpenSim/GridData"> |
10 | <Plugin id="SQLiteGridData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" /> | 9 | <Plugin id="SQLiteGridData" provider="OpenSim.Data.SQLite.dll" type="OpenSim.Data.SQLite.SQLiteGridData" /> |
diff --git a/bin/AssetInventoryServer.ini.example b/bin/AssetInventoryServer.ini.example index 91b8b44..a004818 100644 --- a/bin/AssetInventoryServer.ini.example +++ b/bin/AssetInventoryServer.ini.example | |||
@@ -117,8 +117,8 @@ inventory_database_provider = "OpenSim.Data.MySQL.dll" | |||
117 | ; modification. | 117 | ; modification. |
118 | 118 | ||
119 | ; For SQLite | 119 | ; For SQLite |
120 | ;asset_database_connect = "URI:file:Asset.db,version=3" | 120 | ;asset_database_connect = "URI=file:Asset.db,version=3" |
121 | ;inventory_database_connect = "URI:file:Inventory.db,version=3" | 121 | ;inventory_database_connect = "URI=file:Inventory.db,version=3" |
122 | 122 | ||
123 | ; For MySQL | 123 | ; For MySQL |
124 | asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;" | 124 | asset_database_connect = "Server=localhost; Database=opensim; User=changeme; Password=changeme;" |