From bebfbd0600671a34e87303dc6ba34e994182f993 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 12 Dec 2016 10:14:16 +0000
Subject: Only ask for the new parameter when starting from scratch. It is set
 to false implicitly on existing regions.

---
 OpenSim/Framework/RegionInfo.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework/RegionInfo.cs')

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index d7a51ec..adffe13 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -545,7 +545,7 @@ namespace OpenSim.Framework
 
         private void ReadNiniConfig(IConfigSource source, string name)
         {
-//            bool creatingNew = false;
+            bool creatingNew = false;
 
             if (source.Configs.Count == 0)
             {
@@ -569,7 +569,7 @@ namespace OpenSim.Framework
 
                 source.AddConfig(name);
 
-//                creatingNew = true;
+                creatingNew = true;
             }
 
             if (name == String.Empty)
@@ -696,7 +696,8 @@ namespace OpenSim.Framework
             }
             else
             {
-                m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Resolve hostname to IP on start (for running inside Docker)", "False"));
+                if (creatingNew)
+                    m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Resolve hostname to IP on start (for running inside Docker)", "False"));
 
                 config.Set("ResolveAddress", m_resolveAddress.ToString());
             }
-- 
cgit v1.1