aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-09-09 16:20:46 -0400
committerTeravus Ovares (Dan Olivares)2009-09-09 16:20:46 -0400
commitdf9f80aabd872c11711e1e4efb400a1921a9cab2 (patch)
treea7d5582ed1d763224727c8a6bdf9c1c94a674abd /OpenSim/Region/Application
parent* Lock timers when Calling Start() and Stop() when the Thread Context is murk... (diff)
parentDe-hardcode default home locations on create user (standalone). (diff)
downloadopensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.zip
opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.gz
opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.bz2
opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs8
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
1042 uint regX = 1000; 1042 uint regX = 1000;
1043 uint regY = 1000; 1043 uint regY = 1000;
1044 1044
1045 IConfig standalone;
1046 if ((standalone = m_config.Source.Configs["StandAlone"]) != null)
1047 {
1048 regX = (uint)standalone.GetInt("default_location_x", (int)regX);
1049 regY = (uint)standalone.GetInt("default_location_y", (int)regY);
1050 }
1051
1052
1045 if (cmdparams.Length < 3) 1053 if (cmdparams.Length < 3)
1046 firstName = MainConsole.Instance.CmdPrompt("First name", "Default"); 1054 firstName = MainConsole.Instance.CmdPrompt("First name", "Default");
1047 else firstName = cmdparams[2]; 1055 else firstName = cmdparams[2];