Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

author: Melanie 2011-06-20 03:08:56 +0200
committer: Melanie 2011-06-20 03:08:56 +0200
commit: f4f55c4d6bdbe9a86b5343159916977b331fefe0 (patch)
tree: 08fb85f2aa0193bf8549e684b98501c2c52faa1a /OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
parent: Add some flags to control content in search better (diff)
parent: Merge branch 'master' into careminster-presence-refactor (diff)
download: opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.zip
opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.gz
opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.bz2
opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini b/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
index eb1f473..453e17e 100644
--- a/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
+++ b/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
@@ -29,5 +29,5 @@ port = 8003
 [UserAccountService]
        LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
    StorageProvider = "OpenSim.Data.MySQL.dll"
-    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;Old Guids=true;"
author	Melanie	2011-06-20 03:08:56 +0200
committer	Melanie	2011-06-20 03:08:56 +0200
commit	f4f55c4d6bdbe9a86b5343159916977b331fefe0 (patch)
tree	08fb85f2aa0193bf8549e684b98501c2c52faa1a /OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
parent	Add some flags to control content in search better (diff)
parent	Merge branch 'master' into careminster-presence-refactor (diff)
download	opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.zip opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.gz opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.bz2 opensim-SC_OLD-f4f55c4d6bdbe9a86b5343159916977b331fefe0.tar.xz

diff --git a/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini b/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini index eb1f473..453e17e 100644 --- a/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini +++ b/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
@@ -29,5 +29,5 @@ port = 8003
29	[UserAccountService]	29	[UserAccountService]
30	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"	30	LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
31	StorageProvider = "OpenSim.Data.MySQL.dll"	31	StorageProvider = "OpenSim.Data.MySQL.dll"
32	ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"	32	ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;Old Guids=true;"
33		33