diff options
| author | Melanie | 2009-09-02 16:29:50 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-02 16:29:50 +0100 |
| commit | 8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95 (patch) | |
| tree | aa5824b7839df1471077b276bf0cb89c13369805 /OpenSim/Tests | |
| 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-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.zip opensim-SC-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.gz opensim-SC-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.bz2 opensim-SC-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 10 | ||||
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index d404344..4313c96 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | |||
| @@ -43,11 +43,11 @@ namespace OpenSim.Tests.Common.Mock | |||
| 43 | } | 43 | } |
| 44 | private IUserDataPlugin m_userDataPlugin; | 44 | private IUserDataPlugin m_userDataPlugin; |
| 45 | 45 | ||
| 46 | public IInventoryDataPlugin InventoryDataPlugin | 46 | // public IInventoryDataPlugin InventoryDataPlugin |
| 47 | { | 47 | // { |
| 48 | get { return m_inventoryDataPlugin; } | 48 | // get { return m_inventoryDataPlugin; } |
| 49 | } | 49 | // } |
| 50 | private IInventoryDataPlugin m_inventoryDataPlugin; | 50 | // private IInventoryDataPlugin m_inventoryDataPlugin; |
| 51 | 51 | ||
| 52 | public TestCommunicationsManager() | 52 | public TestCommunicationsManager() |
| 53 | : this(null) | 53 | : this(null) |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 360e6b1..0d8baad 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -163,7 +163,7 @@ namespace OpenSim.Tests.Common.Setup | |||
| 163 | godsModule.Initialise(testScene, new IniConfigSource()); | 163 | godsModule.Initialise(testScene, new IniConfigSource()); |
| 164 | testScene.AddModule(godsModule.Name, godsModule); | 164 | testScene.AddModule(godsModule.Name, godsModule); |
| 165 | realServices = realServices.ToLower(); | 165 | realServices = realServices.ToLower(); |
| 166 | IConfigSource config = new IniConfigSource(); | 166 | // IConfigSource config = new IniConfigSource(); |
| 167 | 167 | ||
| 168 | // If we have a brand new scene, need to initialize shared region modules | 168 | // If we have a brand new scene, need to initialize shared region modules |
| 169 | if ((m_assetService == null && m_inventoryService == null) || newScene) | 169 | if ((m_assetService == null && m_inventoryService == null) || newScene) |