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

8 files changed, 17 insertions, 20 deletions

diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index f030531..0c2f5df 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
@@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
             File.Delete(file);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
index 1249e76..30f6641 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 17fa86c..98458a3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 7a75808..abb97cf 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
@@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
             File.Delete(file);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 52dac39..c9953c5 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Data.SQLite.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            // SQLite doesn't work on power linux
-            if (Directory.Exists("/proc/ppc64"))
+            // SQLite doesn't work on power or z linux
+            if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
             {
                 Assert.Ignore();
             }
@@ -61,4 +61,4 @@ namespace OpenSim.Data.SQLite.Tests
             File.Delete(file);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 14cee36..12d3e95 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         /// <summary>
         /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
         /// </summary>
-        [Test]
+        //[Test]
         public void TestSaveIarV0_1()
         {
             TestHelper.InMethod();
@@ -202,7 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
         /// an account exists with the creator name.
         /// </summary>
-        [Test]
+        //[Test]
         public void TestLoadIarV0_1ExistingUsers()
         {   
             TestHelper.InMethod();
@@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             CommunicationsManager commsManager = scene.CommsManager;
 
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
-            userInfo.FetchInventory();
+            //userInfo.FetchInventory();
             /*
             for (int i = 0 ; i < 50 ; i++)
             {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index fa1fd89..50baa9b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1218,9 +1218,7 @@ namespace OpenSim.Region.Framework.Scenes
             if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
             {
                 StandUp();
-            }
-            
-           
+            }                       
 
             // Check if Client has camera in 'follow cam' or 'build' mode.
             Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation);
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 86a903c..ea34195 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -195,7 +195,6 @@ namespace OpenSim.Services.InventoryService
 
             if (skeletonFolders != null)
             {
-
                 InventoryFolderImpl rootFolder = null;
 
                 // Need to retrieve the root folder on the first pass