2 files changed, 7 insertions, 0 deletions

diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index 1004fb9..9878855 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -299,6 +299,7 @@ namespace OpenSim.Services.Connectors.Inventory
 
             if (StringToUrlAndUserID(id, out url, out userID))
             {
+                //m_log.DebugFormat("[HGInventory CONNECTOR]: calling {0}", url);
                 ISessionAuthInventoryService connector = GetConnector(url);
                 return connector.QueryItem(userID, item, sessionID);
             }
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 14560b1..e69e4cd 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -200,6 +200,12 @@ namespace OpenSim.Services.Interfaces
             Maturity = ConvertFrom.RegionSettings.Maturity;
             RegionSecret = ConvertFrom.regionSecret;
             EstateOwner = ConvertFrom.EstateSettings.EstateOwner;
+            if (EstateOwner == UUID.Zero)
+            {
+                EstateOwner = ConvertFrom.MasterAvatarAssignedUUID;
+                ConvertFrom.EstateSettings.EstateOwner = EstateOwner;
+                ConvertFrom.EstateSettings.Save();
+            }
         }
 
         public GridRegion(GridRegion ConvertFrom)