From bd5d2cb043892399baff85667ee1e6ec6f3b3d2e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 8 Sep 2011 20:51:52 +0100
Subject: Use scene presence agent id for rezzed object ownership rather than
 item owner.

These should be identical.  However, the item isn't available when rezzing npc attachments.
---
 OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index 4e60ca9..ceb7905 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -88,8 +88,7 @@ namespace OpenSim.Tests.Common
             if (type == InventoryType.Notecard)
                 asset = AssetHelpers.CreateAsset(scene, userId);
             else if (type == InventoryType.Object)
-                asset
-                    = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
+                asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
             else
                 throw new Exception(string.Format("Inventory type {0} not supported", type));
 
-- 
cgit v1.1


From 42790f021fd5d69ba10ac02d158681f3d299da80 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Sep 2011 00:47:23 +0100
Subject: Fix unit tests from RegionSettings commit

---
 OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 2ea36da..79bb9c2 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -163,6 +163,10 @@ namespace OpenSim.Data.Null
         {
             RegionSettings rs = null;
             m_regionSettings.TryGetValue(regionUUID, out rs);
+
+            if (rs == null)
+                rs = new RegionSettings();
+            
             return rs;
         }
 
-- 
cgit v1.1