From 83ef13a79add392247ae8e36b419fdc8bc8c6b8b Mon Sep 17 00:00:00 2001
From: Snoopy Pfeffer
Date: Fri, 3 Feb 2012 23:53:18 +0100
Subject: Changed save oar and save iar parameter -p|--profile to -h|--home,
 including corresponding RemoteAdmin parameter

---
 .../Framework/Serialization/External/UserInventoryItemSerializer.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index f138437..b351703 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -305,14 +305,14 @@ namespace OpenSim.Framework.Serialization.External
             writer.WriteEndElement();
             if (options.ContainsKey("creators") && inventoryItem.CreatorData != null && inventoryItem.CreatorData != string.Empty)
                 writer.WriteElementString("CreatorData", inventoryItem.CreatorData);
-            else if (options.ContainsKey("profile"))
+            else if (options.ContainsKey("home"))
             {
                 if (userAccountService != null)
                 {
                     UserAccount account = userAccountService.GetUserAccount(UUID.Zero, inventoryItem.CreatorIdAsUuid);
                     if (account != null)
                     {
-                        writer.WriteElementString("CreatorData", (string)options["profile"] + "/" + inventoryItem.CreatorIdAsUuid + ";" + account.FirstName + " " + account.LastName);
+                        writer.WriteElementString("CreatorData", (string)options["home"] + "/" + inventoryItem.CreatorIdAsUuid + ";" + account.FirstName + " " + account.LastName);
                     }
                     writer.WriteElementString("CreatorID", inventoryItem.CreatorId);
                 }
-- 
cgit v1.1


From 5c545d1d2e0a1862d063a1bdf80d2cd2fa311101 Mon Sep 17 00:00:00 2001
From: PixelTomsen
Date: Fri, 3 Feb 2012 22:02:36 +0100
Subject: Fix: Covenant changed time not set
 http://opensimulator.org/mantis/view.php?id=5869

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
---
 OpenSim/Framework/IClientAPI.cs     |  2 +-
 OpenSim/Framework/RegionSettings.cs | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index dd3e656..c85e599 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1235,7 +1235,7 @@ namespace OpenSim.Framework
         void SendEstateCovenantInformation(UUID covenant);
 
         void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags,
-                                    uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner);
+                                    uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner);
 
         /// <summary>
         /// Send land properties to the client.
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 91e07df..4ce3392 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -413,6 +413,14 @@ namespace OpenSim.Framework
             set { m_Covenant = value; }
         }
 
+        private int m_CovenantChanged = 0;
+
+        public int CovenantChangedDateTime
+        {
+            get { return m_CovenantChanged; }
+            set { m_CovenantChanged = value; }
+        }
+
         private int m_LoadedCreationDateTime;
         public int LoadedCreationDateTime
         {
@@ -492,4 +500,4 @@ namespace OpenSim.Framework
             l_SpawnPoints.Clear();
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1