From 9c9ce9e8dd19c887ba91ff9b70f1b0e4f6a3f8df Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Jun 2010 11:50:42 -0700
Subject: * Deleted duplicated migration that was failing anyway. * Added an
 error message in initial estate owner creation that makes it clear what needs
 to happen.

---
 OpenSim/Data/MySQL/Resources/RegionStore.migrations | 2 --
 OpenSim/Region/Framework/Scenes/Scene.cs            | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index bdb3558..3f644f9 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -787,8 +787,6 @@ CREATE TABLE `regionwindlight` (
   PRIMARY KEY (`region_id`)
 );
 
-ALTER TABLE estate_settings AUTO_INCREMENT = 100;
-COMMIT;
 
 :VERSION 33			#---------------------
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2ff611e..e2ab643 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1334,6 +1334,8 @@ namespace OpenSim.Region.Framework.Scenes
                         m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
                         m_regInfo.EstateSettings.Save();
                     }
+                    else
+                        m_log.ErrorFormat("[SCENE]: Unable to store account. If this simulator is connected to a grid,\n you must create the estate owner account first.");
                 }
                 else
                 {
-- 
cgit v1.1