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

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
         }
         private IUserDataPlugin m_userDataPlugin;
 
-        public IInventoryDataPlugin InventoryDataPlugin
-        {
-            get { return m_inventoryDataPlugin; }
-        }
-        private IInventoryDataPlugin m_inventoryDataPlugin;
+        // public IInventoryDataPlugin InventoryDataPlugin
+        // {
+        //     get { return m_inventoryDataPlugin; }
+        // }
+        // private IInventoryDataPlugin m_inventoryDataPlugin;
 
         public TestCommunicationsManager()
             : 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
             godsModule.Initialise(testScene, new IniConfigSource());
             testScene.AddModule(godsModule.Name, godsModule);
             realServices = realServices.ToLower();
-            IConfigSource config = new IniConfigSource();
+            // IConfigSource config = new IniConfigSource();
             
             // If we have a brand new scene, need to initialize shared region modules
             if ((m_assetService == null && m_inventoryService == null) || newScene)