From b7256f256733f1c7667edc95ec500694bbe35dab Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 8 Sep 2009 17:42:07 +0100
Subject: extend load iar test to loading into a deeply nested directory
 correct bug associated with this

---
 OpenSim/Framework/InventoryFolderBase.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index 0edb2c6..3eef6f6 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.cs
@@ -84,6 +84,14 @@ namespace OpenSim.Framework
             Owner = owner;
         }
 
+        public InventoryFolderBase(UUID id, string name, UUID owner, UUID parent)
+        {
+            ID = id;
+            Name = name;
+            Owner = owner;
+            ParentID = parent;           
+        }
+
         public InventoryFolderBase(UUID id, string name, UUID owner, short type, UUID parent, ushort version)
         {
             ID = id;
-- 
cgit v1.1


From 0683cf6e0d541571d04d6511dc0ecabb17dd1e1e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 Sep 2009 18:03:49 +0100
Subject: Add test to check behaviour if an iar is loaded where no user profile
 exists for the creators Disable generation of temporary profiles for now,
 instead record loading user as creator

---
 OpenSim/Framework/Communications/Osp/OspResolver.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs
index 502fee3..e98317a 100644
--- a/OpenSim/Framework/Communications/Osp/OspResolver.cs
+++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs
@@ -153,7 +153,9 @@ namespace OpenSim.Framework.Communications.Osp
             CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
             if (userInfo != null)
                 return userInfo.UserProfile.ID;
-                        
+
+            // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc
+            /*
             UserProfileData tempUserProfile = new UserProfileData();
             tempUserProfile.FirstName = firstName;
             tempUserProfile.SurName = lastName;
@@ -164,6 +166,9 @@ namespace OpenSim.Framework.Communications.Osp
             commsManager.UserService.AddTemporaryUserProfile(tempUserProfile);
             
             return tempUserProfile.ID;
+            */
+
+            return UUID.Zero;
         }
     }
 }
-- 
cgit v1.1