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

author: Melanie 2009-09-02 16:29:50 +0100
committer: Melanie 2009-09-02 16:29:50 +0100
commit: 8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95 (patch)
tree: aa5824b7839df1471077b276bf0cb89c13369805 /OpenSim/Framework
parent: Correct the icons on wearables in agent inventory. To fully correct the issue (diff)
parent: switching LandManagementModule to "new" region module scheme; cleaning (diff)
download: opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.zip
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.gz
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.bz2
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 2bb0926..e5d8895 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Tests
            CachedUserInfo nonExistingUserInfo;
            TestCommunicationsManager commsManager = new TestCommunicationsManager();
-            Scene myScene = SceneSetupHelpers.SetupScene(commsManager, "");
+            // Scene myScene = SceneSetupHelpers.SetupScene(commsManager, "");
            // Check we can't retrieve info before it exists by uuid
            nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
author	Melanie	2009-09-02 16:29:50 +0100
committer	Melanie	2009-09-02 16:29:50 +0100
commit	8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95 (patch)
tree	aa5824b7839df1471077b276bf0cb89c13369805 /OpenSim/Framework
parent	Correct the icons on wearables in agent inventory. To fully correct the issue (diff)
parent	switching LandManagementModule to "new" region module scheme; cleaning (diff)
download	opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.zip opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.gz opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.bz2 opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.xz

diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index 2bb0926..e5d8895 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Tests
66	CachedUserInfo nonExistingUserInfo;	66	CachedUserInfo nonExistingUserInfo;
67		67
68	TestCommunicationsManager commsManager = new TestCommunicationsManager();	68	TestCommunicationsManager commsManager = new TestCommunicationsManager();
69	Scene myScene = SceneSetupHelpers.SetupScene(commsManager, "");	69	// Scene myScene = SceneSetupHelpers.SetupScene(commsManager, "");
70		70
71	// Check we can't retrieve info before it exists by uuid	71	// Check we can't retrieve info before it exists by uuid
72	nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);	72	nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);