Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Dan Lake 2012-03-27 12:51:58 -0700
committer: Dan Lake 2012-03-27 12:51:58 -0700
commit: 971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree: 2607c27fad429ff0036fe7b7d275ddf717397282 /OpenSim/Tests/Common/Helpers/SceneHelpers.cs
parent: When loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parent: HG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
download: opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.zip
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.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	Dan Lake	2012-03-27 12:51:58 -0700
committer	Dan Lake	2012-03-27 12:51:58 -0700
commit	971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree	2607c27fad429ff0036fe7b7d275ddf717397282 /OpenSim/Tests/Common/Helpers/SceneHelpers.cs
parent	When loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parent	HG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
download	opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.zip opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2 opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.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();