Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 38874f9..e6ddb5b 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1042,6 +1042,14 @@ namespace OpenSim
             uint regX = 1000;
             uint regY = 1000;
 
+            IConfig standalone;
+            if ((standalone = m_config.Source.Configs["StandAlone"]) != null)
+            {
+                regX = (uint)standalone.GetInt("default_location_x", (int)regX);
+                regY = (uint)standalone.GetInt("default_location_y", (int)regY);
+            }
+
+
             if (cmdparams.Length < 3)
                 firstName = MainConsole.Instance.CmdPrompt("First name", "Default");
             else firstName = cmdparams[2];