* If an item creator id contains an iar loaded name, create a temporary profile and hashed UUID to represent the user

OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs

@@ -166,26 +166,10 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
         /// <param name="libraryRootFolder"></param>
         protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
         {
-            LocalInventoryService inventoryService = new LocalInventoryService();
-            List<IInventoryDataPlugin> plugins 
-                = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
-                    m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, 
-                    m_openSim.ConfigurationSettings.StandaloneInventorySource);
-
-            foreach (IInventoryDataPlugin plugin in plugins)
-            {
-                // Using the OSP wrapper plugin for database plugins should be made configurable at some point
-                inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin));
-            }
-
-            LocalBackEndServices backendService = new LocalBackEndServices();
-
-            //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);
-
             m_commsManager
                 = new CommunicationsLocal(
                     m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
-                    inventoryService, backendService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
+                    libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
 
             CreateGridInfoService();
         }
@@ -203,21 +187,6 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
 
         protected virtual void InitialiseHGStandaloneServices(LibraryRootFolder libraryRootFolder)
         {    
-            // Standalone mode
-
-            HGInventoryServiceClient inventoryService 
-                = new HGInventoryServiceClient(m_openSim.NetServersInfo.InventoryURL, null, false);
-            List<IInventoryDataPlugin> plugins 
-                = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
-                    m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, 
-                    m_openSim.ConfigurationSettings.StandaloneInventorySource);
-
-            foreach (IInventoryDataPlugin plugin in plugins)
-            {
-                // Using the OSP wrapper plugin should be made configurable at some point
-                inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin));
-            }        
-
             HGGridServicesStandalone gridService 
                 = new HGGridServicesStandalone(
                     m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);                         
@@ -225,10 +194,9 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
             m_commsManager 
                 = new HGCommunicationsStandalone(
                     m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
-                    inventoryService, gridService, 
+                    gridService, 
                     libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);                        
             
-            inventoryService.UserProfileCache = m_commsManager.UserProfileCacheService;
             HGServices = gridService;
 
             CreateGridInfoService();

OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs

@@ -37,10 +37,12 @@ namespace OpenSim.Framework.Communications.Osp
     public class OspInventoryWrapperPlugin : IInventoryDataPlugin
     {
         protected IInventoryDataPlugin m_wrappedPlugin;
+        protected CommunicationsManager m_commsManager;
 
-        public OspInventoryWrapperPlugin(IInventoryDataPlugin wrappedPlugin)
+        public OspInventoryWrapperPlugin(IInventoryDataPlugin wrappedPlugin, CommunicationsManager commsManager)
         {
             m_wrappedPlugin = wrappedPlugin;
+            m_commsManager = commsManager;
         }
             
         public string Name { get { return "OspInventoryWrapperPlugin"; } }
@@ -51,24 +53,23 @@ namespace OpenSim.Framework.Communications.Osp
 
         public InventoryItemBase getInventoryItem(UUID item)
         {
-            return m_wrappedPlugin.getInventoryItem(item);
+            return PostProcessItem(m_wrappedPlugin.getInventoryItem(item));
-
-            // TODO: Need to post process here
         }
 
         // XXX: Why on earth does this exist as it appears to duplicate getInventoryItem?
         public InventoryItemBase queryInventoryItem(UUID item)
         {
-            return m_wrappedPlugin.queryInventoryItem(item);
+            return PostProcessItem(m_wrappedPlugin.queryInventoryItem(item));
-
-            // TODO: Need to post process here
         }
         
         public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
-            return m_wrappedPlugin.getInventoryInFolder(folderID);
+            List<InventoryItemBase> items = m_wrappedPlugin.getInventoryInFolder(folderID);
             
-            // TODO: Need to post process here
+            foreach (InventoryItemBase item in items)
+                PostProcessItem(item);
+
+            return items;
         }
 
         public List<InventoryItemBase> fetchActiveGestures(UUID avatarID)
@@ -78,6 +79,12 @@ namespace OpenSim.Framework.Communications.Osp
             // Presuming that no post processing is needed here as gestures don't refer to creator information (?)
         }
 
+        protected InventoryItemBase PostProcessItem(InventoryItemBase item)
+        {            
+            item.CreatorIdAsUuid = OspResolver.ResolveOspa(item.CreatorId, m_commsManager);
+            return item;            
+        }
+        
         public List<InventoryFolderBase> getFolderHierarchy(UUID parentID) { return m_wrappedPlugin.getFolderHierarchy(parentID); }
         public List<InventoryFolderBase> getUserRootFolders(UUID user) { return m_wrappedPlugin.getUserRootFolders(user); }
         public InventoryFolderBase getUserRootFolder(UUID user) { return m_wrappedPlugin.getUserRootFolder(user); }

OpenSim/Framework/Communications/Osp/OspResolver.cs

@@ -85,16 +85,15 @@ namespace OpenSim.Framework.Communications.Osp
         /// <param name="ospa"></param>
         /// <param name="commsManager"></param>
         /// <returns>
-        /// A suitable internal OpenSim identifier.  If the input string wasn't ospi data, then we simply
+        /// A suitable UUID for use in Second Life client communication.  If the string was not a valid ospa, then UUID.Zero
-        /// return that same string.  If the input string was ospi data but no valid profile information has been found,
+        /// is returned.
-        /// then returns null.
         /// </returns>
-        public static string ResolveOspa(string ospa, CommunicationsManager commsManager)
+        public static UUID ResolveOspa(string ospa, CommunicationsManager commsManager)
         {
             m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
             
             if (!ospa.StartsWith(OSPA_PREFIX))
-                return ospa;
+                return UUID.Zero;
             
             string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);            
             string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY);
@@ -116,7 +115,7 @@ namespace OpenSim.Framework.Communications.Osp
                     return ResolveOspaName(value, commsManager);
             }
             
-            return null;
+            return UUID.Zero;
         }
         
         /// <summary>
@@ -138,14 +137,14 @@ namespace OpenSim.Framework.Communications.Osp
         /// <returns>
         /// An OpenSim internal identifier for the name given.  Returns null if the name was not valid
         /// </returns>
-        protected static string ResolveOspaName(string name, CommunicationsManager commsManager)
+        protected static UUID ResolveOspaName(string name, CommunicationsManager commsManager)
         {
             int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR);
             
             if (nameSeparatorIndex < 0)
             {
                 m_log.WarnFormat("[OSP RESOLVER]: Ignoring unseparated name {0}", name);
-                return null;
+                return UUID.Zero;
             }
             
             string firstName = name.Remove(nameSeparatorIndex).TrimEnd();
@@ -153,7 +152,7 @@ namespace OpenSim.Framework.Communications.Osp
             
             CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
             if (userInfo != null)
-                return userInfo.UserProfile.ID.ToString();
+                return userInfo.UserProfile.ID;
                         
             UserProfileData tempUserProfile = new UserProfileData();
             tempUserProfile.FirstName = firstName;
@@ -164,7 +163,7 @@ namespace OpenSim.Framework.Communications.Osp
                 "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);            
             commsManager.UserService.AddTemporaryUserProfile(tempUserProfile);
             
-            return tempUserProfile.ID.ToString();
+            return tempUserProfile.ID;
         }
     }
 }

OpenSim/Framework/InventoryItemBase.cs

@@ -48,38 +48,30 @@ namespace OpenSim.Framework
         /// <value>
         /// The creator of this item
         /// </value>        
-        public string CreatorId
+        public string CreatorId { get; set; }      
-        {
-            get { return m_creatorId; }
-            set 
-            { 
-                m_creatorId = value;
-                UUID creatorIdAsUuid;
-
-                // For now, all IDs are UUIDs
-                UUID.TryParse(m_creatorId, out creatorIdAsUuid);
-                CreatorIdAsUuid = creatorIdAsUuid;
-            }
-        }
-
-        private string m_creatorId = String.Empty;        
 
         /// <value>
-        /// The creator of this item expressed as a UUID
+        /// The creator of this item expressed as a UUID.  Database plugins don't need to set this, it will be set by
+        /// upstream code (or set by the get accessor if left unset).
         /// </value>
         public UUID CreatorIdAsUuid 
         {
             get
             {
+                if (UUID.Zero == m_creatorIdAsUuid)
+                {
+                    UUID.TryParse(CreatorId, out m_creatorIdAsUuid);
+                }
+
                 return m_creatorIdAsUuid;
             }
+            
             set
             {
                 m_creatorIdAsUuid = value;
             }
         }     
-
+        protected UUID m_creatorIdAsUuid = UUID.Zero;
-        private UUID m_creatorIdAsUuid = UUID.Zero;
 
         /// <value>
         /// The description of the inventory item (must be less than 64 characters)

OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs

@@ -25,9 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Collections.Generic;
+using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Osp;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Communications.Local;
@@ -42,7 +45,6 @@ namespace OpenSim.Region.Communications.Hypergrid
             NetworkServersInfo serversInfo,
             BaseHttpServer httpServer,
             IAssetCache assetCache,
-            LocalInventoryService inventoryService,
             HGGridServices gridService, 
             LibraryRootFolder libraryRootFolder, 
             bool dumpAssetsToFile)
@@ -53,9 +55,23 @@ namespace OpenSim.Region.Communications.Hypergrid
                     serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
             localUserService.AddPlugin(configSettings.StandaloneUserPlugin, configSettings.StandaloneUserSource); 
 
+            HGInventoryServiceClient inventoryService 
+                = new HGInventoryServiceClient(serversInfo.InventoryURL, null, false);
+            List<IInventoryDataPlugin> plugins 
+                = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
+                    configSettings.StandaloneInventoryPlugin, 
+                    configSettings.StandaloneInventorySource);
+
+            foreach (IInventoryDataPlugin plugin in plugins)
+            {
+                // Using the OSP wrapper plugin should be made configurable at some point
+                inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this));
+            }
+            
             AddInventoryService(inventoryService);
             m_defaultInventoryHost = inventoryService.Host;
             m_interServiceInventoryService = inventoryService;
+            inventoryService.UserProfileCache = UserProfileCacheService;
                         
             m_assetCache = assetCache;
             // Let's swap to always be secure access to inventory

OpenSim/Region/Communications/Local/CommunicationsLocal.cs

@@ -25,9 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Collections.Generic;
+using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Osp;
 using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Region.Communications.Local
@@ -39,12 +42,22 @@ namespace OpenSim.Region.Communications.Local
             NetworkServersInfo serversInfo,
             BaseHttpServer httpServer,
             IAssetCache assetCache,
-            LocalInventoryService inventoryService,
-            IGridServices gridService,
             LibraryRootFolder libraryRootFolder, 
             bool dumpAssetsToFile)
             : base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder)
         {
+            LocalInventoryService inventoryService = new LocalInventoryService();
+            List<IInventoryDataPlugin> plugins 
+                = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
+                    configSettings.StandaloneInventoryPlugin, 
+                    configSettings.StandaloneInventorySource);
+
+            foreach (IInventoryDataPlugin plugin in plugins)
+            {
+                // Using the OSP wrapper plugin for database plugins should be made configurable at some point
+                inventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this));
+            }
+            
             AddInventoryService(inventoryService);
             m_defaultInventoryHost = inventoryService.Host;
             m_interServiceInventoryService = inventoryService;
@@ -59,7 +72,9 @@ namespace OpenSim.Region.Communications.Local
             m_avatarService = lus;
             m_messageService = lus;
 
-            m_gridService = gridService;            
+            m_gridService = new LocalBackEndServices();
+
+            //LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, backendService);                      
         }
     }
 }

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs

@@ -157,9 +157,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         // Don't use the item ID that's in the file
                         item.ID = UUID.Random();
 
-                        string ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_commsManager); 
+                        UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_commsManager); 
-                        if (null != ospResolvedId)
+                        if (UUID.Zero != ospResolvedId)
-                            item.CreatorId = ospResolvedId;
+                            item.CreatorIdAsUuid = ospResolvedId;
                         
                         item.Owner = m_userInfo.UserProfile.ID;
 

OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs

@@ -253,7 +253,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);            
             InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
             
-            Assert.That(foundItem.CreatorId, Is.EqualTo(user2Uuid.ToString()));            
+            Assert.That(foundItem.CreatorId, Is.EqualTo(item1.CreatorId));
+            Assert.That(foundItem.CreatorIdAsUuid, Is.EqualTo(user2Uuid));
             Assert.That(foundItem.Owner, Is.EqualTo(userUuid));            
             
             Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
@@ -321,7 +322,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);            
             InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
             
-            Assert.That(foundItem.CreatorId, Is.EqualTo(user2Profile.ID.ToString()));            
+            Assert.That(foundItem.CreatorId, Is.EqualTo(item1.CreatorId));
+            Assert.That(
+                foundItem.CreatorIdAsUuid, Is.EqualTo(OspResolver.HashName(user2FirstName + " " + user2LastName)));
             Assert.That(foundItem.Owner, Is.EqualTo(userUuid));
             
             Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod());