Merge branch 'master' into careminster-presence-refactor

The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
index 915af7e..135c50e 100644
--- a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common
 
         public static InventoryItemBase CreateInventoryItem(
             Scene scene, string itemName, UUID itemId, string folderPath, UUID userId)
-        {            
+        {
             InventoryItemBase item = new InventoryItemBase();
             item.Name = itemName;
             item.AssetID = AssetHelpers.CreateAsset(scene, userId).FullID;
@@ -52,7 +52,7 @@ namespace OpenSim.Tests.Common
             InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object);
             
             item.Folder = objsFolder.ID;
-            scene.AddInventoryItem(item);            
+            scene.AddInventoryItem(item);
             
             return item;
         }