From 19c659ca99349a974564d87fcdf42a2c66d2a875 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 25 Mar 2010 21:46:23 +0000
Subject: fix unit tests broken by commit
 dcf18689b9ab29d4ceb2348bb56fc1f77a7a8912 can't prompt for estate owner in
 unit tests

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index da81c03..6495899 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1258,7 +1258,7 @@ namespace OpenSim.Region.Framework.Scenes
             //
             // TODO: Find a better place for this
             //
-            while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero)
+            while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
             {
                 MainConsole.Instance.Output("The current estate has no owner set.");
                 string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test");
-- 
cgit v1.1