Merge branch 'master' into bulletsim

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs

9 files changed, 55 insertions, 52 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs
index 1aa96c7..c2fecef 100644
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Data.MSSQL
                         cmd.ExecuteNonQuery();
                     }
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     throw new Exception(sql);
 
diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
index 10b0f29..b19a0da 100644
--- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Data.MSSQL
                     {
                         cmd.ExecuteNonQuery();
                     }
-                    catch (Exception e)
+                    catch (Exception)
                     {
                         return false;
                     }                
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index e740232..a743479 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -251,12 +251,14 @@ namespace OpenSim.Data.MySQL
         }
 
         /// <summary>
-        /// check if the asset UUID exist in database
+        /// Check if the asset exists in the database
         /// </summary>
         /// <param name="uuid">The asset UUID</param>
-        /// <returns>true if exist.</returns>
+        /// <returns>true if it exists, false otherwise.</returns>
         override public bool ExistsAsset(UUID uuid)
         {
+//            m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
+
             bool assetExists = false;
 
             lock (m_dbLock)
@@ -273,7 +275,10 @@ namespace OpenSim.Data.MySQL
                             using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
                             {
                                 if (dbReader.Read())
+                                {
+//                                    m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
                                     assetExists = true;
+                                }
                             }
                         }
                         catch (Exception e)
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index 53e5207..11013c1 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Data.Null
 
             foreach (RegionData r in m_regionData.Values)
             {
-                    m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower());
+//                    m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower());
                     if (queryMatch(r.RegionName.ToLower()))
                         ret.Add(r);
             }
diff --git a/OpenSim/Data/SQLite/Resources/XInventoryStore.migrations b/OpenSim/Data/SQLite/Resources/XInventoryStore.migrations
index d5b3019..de44982 100644
--- a/OpenSim/Data/SQLite/Resources/XInventoryStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/XInventoryStore.migrations
@@ -41,11 +41,9 @@ COMMIT;
 
 :VERSION 2
 
-ATTACH 'inventoryStore.db' AS old;
-
 BEGIN TRANSACTION;
 
 INSERT INTO inventoryfolders (folderName, type, version, folderID, agentID, parentFolderID) SELECT `name` AS folderName, `type` AS type, `version` AS version, `UUID` AS folderID, `agentID` AS agentID, `parentID` AS parentFolderID from old.inventoryfolders;
 INSERT INTO inventoryitems (assetID, assetType, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryID, parentFolderID, avatarID, inventoryGroupPermissions) SELECT `assetID`, `assetType` AS assetType, `inventoryName` AS inventoryName, `inventoryDescription` AS inventoryDescription, `inventoryNextPermissions` AS inventoryNextPermissions, `inventoryCurrentPermissions` AS inventoryCurrentPermissions, `invType` AS invType, `creatorsID` AS creatorID, `inventoryBasePermissions` AS inventoryBasePermissions, `inventoryEveryOnePermissions` AS inventoryEveryOnePermissions, `salePrice` AS salePrice, `saleType` AS saleType, `creationDate` AS creationDate, `groupID` AS groupID, `groupOwned` AS groupOwned, `flags` AS flags, `UUID` AS inventoryID, `parentFolderID` AS parentFolderID, `avatarID` AS avatarID, `inventoryGroupPermissions` AS inventoryGroupPermissions FROM old.inventoryitems;
 
-COMMIT;
\ No newline at end of file
+COMMIT;
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs
index b5ae244..1174e2f 100644
--- a/OpenSim/Data/Tests/AssetTests.cs
+++ b/OpenSim/Data/Tests/AssetTests.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T001_LoadEmpty()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             Assert.That(m_db.ExistsAsset(uuid1), Is.False);
             Assert.That(m_db.ExistsAsset(uuid2), Is.False);
@@ -116,7 +116,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T010_StoreReadVerifyAssets()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString());
             AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString());
@@ -183,7 +183,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T020_CheckForWeirdCreatorID()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // It is expected that eventually the CreatorID might be an arbitrary string (an URI)
             // rather than a valid UUID (?).  This test is to make sure that the database layer does not
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs
index 8d332da..3e47bcf 100644
--- a/OpenSim/Data/Tests/EstateTests.cs
+++ b/OpenSim/Data/Tests/EstateTests.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T010_EstateSettingsSimpleStorage_MinimumParameterSet()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             EstateSettingsSimpleStorage(
                 REGION_ID,
@@ -140,7 +140,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T011_EstateSettingsSimpleStorage_MaximumParameterSet()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             EstateSettingsSimpleStorage(
                 REGION_ID,
@@ -173,7 +173,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T012_EstateSettingsSimpleStorage_AccurateParameterSet()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             EstateSettingsSimpleStorage(
                 REGION_ID,
@@ -206,7 +206,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T012_EstateSettingsRandomStorage()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -227,7 +227,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T020_EstateSettingsManagerList()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -248,7 +248,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T021_EstateSettingsUserList()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -269,7 +269,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T022_EstateSettingsGroupList()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -290,7 +290,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T022_EstateSettingsBanList()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs
index cf3bac1..5b6b61b 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T001_LoadEmpty()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             Assert.That(db.getInventoryFolder(zero), Is.Null);
             Assert.That(db.getInventoryFolder(folder1), Is.Null);
@@ -134,7 +134,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T010_FolderNonParent()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2);
             // the folder will go in
@@ -146,7 +146,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T011_FolderCreate()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1);
             // TODO: this is probably wrong behavior, but is what we have
@@ -171,7 +171,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T012_FolderList()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3);
             db.addInventoryFolder(f2);
@@ -187,7 +187,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T013_FolderHierarchy()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             int n = db.getFolderHierarchy(zero).Count;  // (for dbg - easier to see what's returned)
             Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
@@ -202,7 +202,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T014_MoveFolder()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             InventoryFolderBase f2 = db.getInventoryFolder(folder2);
             f2.ParentID = folder3;
@@ -218,7 +218,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T015_FolderHierarchy()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
             Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))");
@@ -231,7 +231,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T100_NoItems()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
             Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))");
@@ -245,7 +245,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T101_CreatItems()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1));
             db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2));
@@ -256,7 +256,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T102_CompareItems()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             InventoryItemBase i1 = db.getInventoryItem(item1);
             InventoryItemBase i2 = db.getInventoryItem(item2);
@@ -275,7 +275,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T103_UpdateItem()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // TODO: probably shouldn't have the ability to have an
             // owner of an item in a folder not owned by the user
@@ -295,7 +295,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T104_RandomUpdateItem()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             PropertyScrambler<InventoryFolderBase> folderScrambler =
                 new PropertyScrambler<InventoryFolderBase>()
@@ -354,7 +354,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T999_StillNull()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // After all tests are run, these should still return no results
             Assert.That(db.getInventoryFolder(zero), Is.Null);
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 44cf1ab..2b8fa59 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T001_LoadEmpty()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
             List<SceneObjectGroup> objs3 = db.LoadObjects(region3);
@@ -169,7 +169,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T010_StoreSimpleObject()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             SceneObjectGroup sog = NewSOG("object1", prim1, region1);
             SceneObjectGroup sog2 = NewSOG("object2", prim2, region1);
@@ -204,7 +204,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T011_ObjectNames()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
             foreach (SceneObjectGroup sog in objs)
@@ -218,7 +218,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T012_SceneParts()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             UUID tmp0 = UUID.Random();
             UUID tmp1 = UUID.Random();
@@ -253,7 +253,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T013_DatabasePersistency()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // Sets all ScenePart parameters, stores and retrieves them, then check for consistency with initial data
             // The commented Asserts are the ones that are unchangeable (when storing on the database, their "Set" values are ignored
@@ -430,7 +430,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T014_UpdateObject()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             string text1 = "object1 text";
             SceneObjectGroup sog = FindSOG("object1", region1);
@@ -540,7 +540,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T015_LargeSceneObjects()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             UUID id = UUID.Random();
             Dictionary<UUID, SceneObjectPart> mydic = new Dictionary<UUID, SceneObjectPart>();
@@ -587,7 +587,7 @@ namespace OpenSim.Data.Tests
         //[Test]
         public void T016_RandomSogWithSceneParts()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             PropertyScrambler<SceneObjectPart> scrambler =
                 new PropertyScrambler<SceneObjectPart>()
@@ -663,7 +663,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T020_PrimInventoryEmpty()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             SceneObjectGroup sog = GetMySOG("object1");
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
@@ -687,7 +687,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T021_PrimInventoryBasic()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             SceneObjectGroup sog = GetMySOG("object1");
             InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero);
@@ -727,7 +727,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T025_PrimInventoryPersistency()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             InventoryItemBase i = new InventoryItemBase();
             UUID id = UUID.Random();
@@ -800,7 +800,7 @@ namespace OpenSim.Data.Tests
         [ExpectedException(typeof(ArgumentException))]
         public void T026_PrimInventoryMany()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             UUID i1,i2,i3,i4;
             i1 = UUID.Random();
@@ -832,7 +832,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T052_RemoveObject()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             db.RemoveObject(prim1, region1);
             SceneObjectGroup sog = FindSOG("object1", region1);
@@ -842,7 +842,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T100_DefaultRegionInfo()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             RegionSettings r1 = db.LoadRegionSettings(region1);
             Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))");
@@ -854,7 +854,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T101_UpdateRegionInfo()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             int agentlimit = random.Next();
             double objectbonus = random.Next();
@@ -960,7 +960,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T300_NoTerrain()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             Assert.That(db.LoadTerrain(zero), Is.Null);
             Assert.That(db.LoadTerrain(region1), Is.Null);
@@ -971,7 +971,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T301_CreateTerrain()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             double[,] t1 = GenTerrain(height1);
             db.StoreTerrain(t1, region1);
@@ -985,7 +985,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T302_FetchTerrain()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             double[,] baseterrain1 = GenTerrain(height1);
             double[,] baseterrain2 = GenTerrain(height2);
@@ -997,7 +997,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T303_UpdateTerrain()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             double[,] baseterrain1 = GenTerrain(height1);
             double[,] baseterrain2 = GenTerrain(height2);
@@ -1011,7 +1011,7 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T400_EmptyLand()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))");
             Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))");