aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-25 21:46:23 +0000
committerJustin Clark-Casey (justincc)2010-03-25 21:46:23 +0000
commit19c659ca99349a974564d87fcdf42a2c66d2a875 (patch)
treeabbf30d3abbf387697a02f5d9e25c8d673d9fe48 /OpenSim/Region/Framework/Scenes
parentminor: Print out port that http servers are using (diff)
downloadopensim-SC_OLD-19c659ca99349a974564d87fcdf42a2c66d2a875.zip
opensim-SC_OLD-19c659ca99349a974564d87fcdf42a2c66d2a875.tar.gz
opensim-SC_OLD-19c659ca99349a974564d87fcdf42a2c66d2a875.tar.bz2
opensim-SC_OLD-19c659ca99349a974564d87fcdf42a2c66d2a875.tar.xz
fix unit tests broken by commit dcf18689b9ab29d4ceb2348bb56fc1f77a7a8912
can't prompt for estate owner in unit tests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
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
1258 // 1258 //
1259 // TODO: Find a better place for this 1259 // TODO: Find a better place for this
1260 // 1260 //
1261 while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero) 1261 while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
1262 { 1262 {
1263 MainConsole.Instance.Output("The current estate has no owner set."); 1263 MainConsole.Instance.Output("The current estate has no owner set.");
1264 string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test"); 1264 string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test");