From db4cdc09614abc1c35a242f4c882b2e3285f0206 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Wed, 14 Oct 2009 04:18:59 +0100
Subject: [PATCH] Set the estate owner to be the master avatar if it's not set.

---
 OpenSim/Services/Interfaces/IGridService.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 14560b1356..e69e4cd1dd 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)