OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only ask for the new parameter when starting from scratch. 

It is set to false implicitly on existing regions.
melanie
Melanie Thielker 2016-12-12 10:14:16 +00:00
parent 9ef9dde0f3
commit bebfbd0600
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/RegionInfo.cs
View File

@ -545,7 +545,7 @@ namespace OpenSim.Framework
private void ReadNiniConfig(IConfigSource source, string name) private void ReadNiniConfig(IConfigSource source, string name)
{ {
// bool creatingNew = false; bool creatingNew = false;
if (source.Configs.Count == 0) if (source.Configs.Count == 0)
{ {
@ -569,7 +569,7 @@ namespace OpenSim.Framework
source.AddConfig(name); source.AddConfig(name);
// creatingNew = true; creatingNew = true;
} }
if (name == String.Empty) if (name == String.Empty)
@ -696,7 +696,8 @@ namespace OpenSim.Framework
} }
else 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()); config.Set("ResolveAddress", m_resolveAddress.ToString());
} }