diff options
author | Melanie Thielker | 2016-12-12 10:14:16 +0000 |
---|---|---|
committer | Melanie Thielker | 2016-12-12 10:14:16 +0000 |
commit | bebfbd0600671a34e87303dc6ba34e994182f993 (patch) | |
tree | 0e8e5253e636b518cedcd23fc765767528b8d8b7 | |
parent | Make resolving the IP on startup optional. (diff) | |
download | opensim-SC_OLD-bebfbd0600671a34e87303dc6ba34e994182f993.zip opensim-SC_OLD-bebfbd0600671a34e87303dc6ba34e994182f993.tar.gz opensim-SC_OLD-bebfbd0600671a34e87303dc6ba34e994182f993.tar.bz2 opensim-SC_OLD-bebfbd0600671a34e87303dc6ba34e994182f993.tar.xz |
Only ask for the new parameter when starting from scratch.
It is set to false implicitly on existing regions.
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 7 |
1 files changed, 4 insertions, 3 deletions
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 | |||
545 | 545 | ||
546 | private void ReadNiniConfig(IConfigSource source, string name) | 546 | private void ReadNiniConfig(IConfigSource source, string name) |
547 | { | 547 | { |
548 | // bool creatingNew = false; | 548 | bool creatingNew = false; |
549 | 549 | ||
550 | if (source.Configs.Count == 0) | 550 | if (source.Configs.Count == 0) |
551 | { | 551 | { |
@@ -569,7 +569,7 @@ namespace OpenSim.Framework | |||
569 | 569 | ||
570 | source.AddConfig(name); | 570 | source.AddConfig(name); |
571 | 571 | ||
572 | // creatingNew = true; | 572 | creatingNew = true; |
573 | } | 573 | } |
574 | 574 | ||
575 | if (name == String.Empty) | 575 | if (name == String.Empty) |
@@ -696,7 +696,8 @@ namespace OpenSim.Framework | |||
696 | } | 696 | } |
697 | else | 697 | else |
698 | { | 698 | { |
699 | m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Resolve hostname to IP on start (for running inside Docker)", "False")); | 699 | if (creatingNew) |
700 | m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Resolve hostname to IP on start (for running inside Docker)", "False")); | ||
700 | 701 | ||
701 | config.Set("ResolveAddress", m_resolveAddress.ToString()); | 702 | config.Set("ResolveAddress", m_resolveAddress.ToString()); |
702 | } | 703 | } |