Merge branch 'master' into careminster-presence-refactor

author: Melanie 2011-06-11 12:08:02 +0100
committer: Melanie 2011-06-11 12:08:02 +0100
commit: a1c16a42002757f65d77b530571405bd740bf2f7 (patch)
tree: 6b86e3ddd09538f83c541a36d02f6668eeed8745 /OpenSim/Tests
parent: Merge branch 'master' into careminster-presence-refactor (diff)
parent: Added a Sleep in between each site call, to slow the xml-rpc requests down. (diff)
download: opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.zip
opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.tar.gz
opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.tar.bz2
opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.tar.xz
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
index 47e73f9..8610c78 100644
--- a/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
+++ b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
@@ -29,5 +29,5 @@ port = 8003
 [PresenceService]
        LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
    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;"
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-11 12:08:02 +0100
committer	Melanie	2011-06-11 12:08:02 +0100
commit	a1c16a42002757f65d77b530571405bd740bf2f7 (patch)
tree	6b86e3ddd09538f83c541a36d02f6668eeed8745 /OpenSim/Tests
parent	Merge branch 'master' into careminster-presence-refactor (diff)
parent	Added a Sleep in between each site call, to slow the xml-rpc requests down. (diff)
download	opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.zip opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.tar.gz opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.tar.bz2 opensim-SC_OLD-a1c16a42002757f65d77b530571405bd740bf2f7.tar.xz

diff --git a/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini index 47e73f9..8610c78 100644 --- a/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini +++ b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
@@ -29,5 +29,5 @@ port = 8003
29	[PresenceService]	29	[PresenceService]
30	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"	30	LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
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


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