Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
author: Melanie 2012-03-07 00:51:59 +0000
committer: Melanie 2012-03-07 00:51:59 +0000
commit: caa19862fa9a26bc5ee53e220565f99fc4084f33 (patch)
tree: 6b7629a4156c9c9865c08c45108c46b805fa6239 /OpenSim/Tests/Common/Helpers/SceneHelpers.cs
parent: Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent: Stop individually deleting objects at the end of each ObjectTortureTest. (diff)
download: opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.zip
opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.gz
opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.bz2
opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 8a69d7c..7bf08ae 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Tests.Common
                                                                   StartAuthenticationService(testScene);
            LocalInventoryServicesConnector   inventoryService   = StartInventoryService(testScene);
                                                                   StartGridService(testScene);
-            LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);            
+            LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
            LocalPresenceServicesConnector    presenceService    = StartPresenceService(testScene);
            inventoryService.PostInitialise();
author	Melanie	2012-03-07 00:51:59 +0000
committer	Melanie	2012-03-07 00:51:59 +0000
commit	caa19862fa9a26bc5ee53e220565f99fc4084f33 (patch)
tree	6b7629a4156c9c9865c08c45108c46b805fa6239 /OpenSim/Tests/Common/Helpers/SceneHelpers.cs
parent	Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent	Stop individually deleting objects at the end of each ObjectTortureTest. (diff)
download	opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.zip opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.gz opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.bz2 opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.xz

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 8a69d7c..7bf08ae 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Tests.Common
136	StartAuthenticationService(testScene);	136	StartAuthenticationService(testScene);
137	LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene);	137	LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene);
138	StartGridService(testScene);	138	StartGridService(testScene);
139	LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);	139	LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
140	LocalPresenceServicesConnector presenceService = StartPresenceService(testScene);	140	LocalPresenceServicesConnector presenceService = StartPresenceService(testScene);
141		141
142	inventoryService.PostInitialise();	142	inventoryService.PostInitialise();