Merge branch 'master' of ssh://MyConnection/var/git/opensim

5 files changed, 23 insertions, 11 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 8532d03..b778389 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -348,9 +348,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.CommsManager); 
             if (UUID.Zero != ospResolvedId)
+            {                
                 item.CreatorIdAsUuid = ospResolvedId;
+
+                // XXX: For now, don't preserve the OSPA in the creator id (which actually gets persisted to the
+                // database).  Instead, replace with the UUID that we found.
+                item.CreatorId = ospResolvedId.ToString();                
+            }
             else
+            {
                 item.CreatorIdAsUuid = m_userInfo.UserProfile.ID;
+            }
             
             item.Owner = m_userInfo.UserProfile.ID;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 2c0d113..ecd60bd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             string savePath = (cmdparams.Length > 6 ? cmdparams[6] : DEFAULT_INV_BACKUP_FILENAME);
 
             m_log.InfoFormat(
-                "[INVENTORY ARCHIVER]: Saving archive {0} from inventory path {1} for {2} {3}",
+                "[INVENTORY ARCHIVER]: Saving archive {0} using inventory path {1} for {2} {3}",
                 savePath, invPath, firstName, lastName);
 
             Guid id = Guid.NewGuid();
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 7927352..e4dad18 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -259,9 +259,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, item1Name);
             
             Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
+
+// We have to disable this check since loaded items that did find users via OSPA resolution are now only storing the
+// UUID, not the OSPA itself.
+//            Assert.That(
+//                foundItem1.CreatorId, Is.EqualTo(item1.CreatorId), 
+//                "Loaded item non-uuid creator doesn't match original");
             Assert.That(
-                foundItem1.CreatorId, Is.EqualTo(item1.CreatorId), 
+                foundItem1.CreatorId, Is.EqualTo(userItemCreatorUuid.ToString()), 
                 "Loaded item non-uuid creator doesn't match original");
+            
             Assert.That(
                 foundItem1.CreatorIdAsUuid, Is.EqualTo(userItemCreatorUuid), 
                 "Loaded item uuid creator doesn't match original");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
index ee809bd..d9f6e33 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
@@ -263,8 +263,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
                     {
                         // We need to make a local copy of the object
                         ISceneObject sogClone = sog.CloneForNewScene();
-                        sogClone.SetState(sog.GetStateSnapshot(),
-                                s.RegionInfo.RegionID);
+                        sogClone.SetState(sog.GetStateSnapshot(), s);
                         return s.IncomingCreateObject(sogClone);
                     }
                     else
@@ -294,15 +293,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
 
         #region Misc
 
-        public UUID GetRegionID(ulong regionhandle)
+        public Scene GetScene(ulong regionhandle)
         {
             foreach (Scene s in m_sceneList)
             {
                 if (s.RegionInfo.RegionHandle == regionhandle)
-                    return s.RegionInfo.RegionID;
+                    return s;
             }
             // ? weird. should not happen
-            return m_sceneList[0].RegionInfo.RegionID;
+            return m_sceneList[0];
         }
 
         public bool IsLocalRegion(ulong regionhandle)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
index 696225c..710e3ca 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
@@ -641,7 +641,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             if (args["extra"] != null)
                 extraStr = args["extra"].AsString();
 
-            UUID regionID = m_localBackend.GetRegionID(regionhandle);
+            IScene s = m_localBackend.GetScene(regionhandle);
             SceneObjectGroup sog = null;
             try
             {
@@ -663,7 +663,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
                 {
                     try
                     {
-                        sog.SetState(stateXmlStr, regionID);
+                        sog.SetState(stateXmlStr, s);
                     }
                     catch (Exception ex)
                     {
@@ -695,8 +695,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
             if (args["itemid"] != null)
                 itemID = args["itemid"].AsUUID();
 
-            //UUID regionID = m_localBackend.GetRegionID(regionhandle);
-
             // This is the meaning of PUT object
             bool result = m_localBackend.SendCreateObject(regionhandle, userID, itemID);