Dump OpenSim 0.9.0.1 into it's own branch.

2 files changed, 5 insertions, 6 deletions

diff --git a/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs b/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
index 671aca7..1549851 100644
--- a/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
+++ b/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
@@ -95,7 +95,7 @@ namespace Robust.Tests
             Assert.AreNotEqual(regions, null, "GetRegionsByName failed");
             Assert.AreEqual(regions.Count, 3, "GetRegionsByName should return 3");
 
-            regions = m_Connector.GetRegionRange(UUID.Zero, 
+            regions = m_Connector.GetRegionRange(UUID.Zero,
                 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002),
                 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002) );
             Assert.AreNotEqual(regions, null, "GetRegionRange failed");
@@ -126,7 +126,7 @@ namespace Robust.Tests
             region.ExternalHostName = "127.0.0.1";
             region.HttpPort = 9000;
             region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 9000);
-          
+
             return region;
         }
     }
diff --git a/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs b/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs
index 0280b73..fe46a4f 100644
--- a/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs
+++ b/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs
@@ -159,8 +159,7 @@ namespace Robust.Tests
             XInventoryServicesConnector m_Connector = new XInventoryServicesConnector(DemonServer.Address);
 
             // Prefetch Notecard 1, will be cached from here on
-            InventoryItemBase item = new InventoryItemBase(new UUID("10000000-0000-0000-0000-000000000001"), m_userID);
-            item = m_Connector.GetItem(item);
+            InventoryItemBase item = m_Connector.GetItem(m_userID, new UUID("10000000-0000-0000-0000-000000000001"));
             Assert.NotNull(item, "Failed to get Notecard 1");
             Assert.AreEqual("Test Notecard 1", item.Name, "Wrong name for Notecard 1");
 
@@ -177,7 +176,7 @@ namespace Robust.Tests
             Assert.NotNull(items, "(Repeat) Failed to get multiple items");
             Assert.IsTrue(items.Length == 2, "(Repeat) Requested 2 items, but didn't receive 2 items");
 
-            // This item doesn't exist, but [0] does, and it's cached. 
+            // This item doesn't exist, but [0] does, and it's cached.
             uuids[1] = new UUID("bb000000-0000-0000-0000-0000000000bb");
             // Fetching should return 2 items, but [1] should be null
             items = m_Connector.GetMultipleItems(m_userID, uuids);
@@ -186,7 +185,7 @@ namespace Robust.Tests
             Assert.AreEqual("Test Notecard 1", items[0].Name, "(Three times) Wrong name for Notecard 1");
             Assert.IsNull(items[1], "(Three times) Expecting 2nd item to be null");
 
-            // Now both don't exist 
+            // Now both don't exist
             uuids[0] = new UUID("aa000000-0000-0000-0000-0000000000aa");
             items = m_Connector.GetMultipleItems(m_userID, uuids);
             Assert.Null(items[0], "Request to multiple non-existent items is supposed to return null [0]");