Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-06-04 21:11:15 +0100
committer: Melanie 2010-06-04 21:11:15 +0100
commit: c5878b6610d4a729752fddf15ad6c99c302375a3 (patch)
tree: 12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Data/Tests/Resources/TestDataConnections.ini
parent: Change the admin kick message to something more generic, "OpenSim Manager" is... (diff)
parent: bring TestLoadIarV0_1AbsentUsers() back online (diff)
download: opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.zip
opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz
opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2
opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
index 5e68ab0..7b55467 100644
--- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini
+++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
@@ -21,4 +21,4 @@
 [TestConnections]
 MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"
 SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;"
-SqliteConnection=""
-\ No newline at end of file
+SqliteConnection="URI=file:opensim-nunit.db,version=3"
+\ No newline at end of file
author	Melanie	2010-06-04 21:11:15 +0100
committer	Melanie	2010-06-04 21:11:15 +0100
commit	c5878b6610d4a729752fddf15ad6c99c302375a3 (patch)
tree	12c570c68ed6f49965ce42fa0147b79ca21d9f96 /OpenSim/Data/Tests/Resources/TestDataConnections.ini
parent	Change the admin kick message to something more generic, "OpenSim Manager" is... (diff)
parent	bring TestLoadIarV0_1AbsentUsers() back online (diff)
download	opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.zip opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.gz opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.bz2 opensim-SC_OLD-c5878b6610d4a729752fddf15ad6c99c302375a3.tar.xz

diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini index 5e68ab0..7b55467 100644 --- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini +++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
@@ -21,4 +21,4 @@
21	[TestConnections]	21	[TestConnections]
22	MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"	22	MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"
23	SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;"	23	SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;"
24	SqliteConnection="" \ No newline at end of file	24	SqliteConnection="URI=file:opensim-nunit.db,version=3" \ No newline at end of file