aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs28
2 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 6829bef..edb29db 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -32,7 +32,7 @@ using System.IO;
32using System.Net; 32using System.Net;
33using System.Reflection; 33using System.Reflection;
34using System.Threading; 34using System.Threading;
35using libsecondlife; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
38using OpenSim.Framework; 38using OpenSim.Framework;
@@ -776,7 +776,7 @@ namespace OpenSim
776 { 776 {
777 m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason."); 777 m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon. If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason.");
778 778
779 LLVector3 loadOffset = new LLVector3(0, 0, 0); 779 Vector3 loadOffset = new Vector3(0, 0, 0);
780 if (cmdparams.Length > 0) 780 if (cmdparams.Length > 0)
781 { 781 {
782 bool generateNewIDS = false; 782 bool generateNewIDS = false;
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 4003001..86db865 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -32,7 +32,7 @@ using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Text; 33using System.Text;
34using System.Threading; 34using System.Threading;
35using libsecondlife; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using Nini.Config; 37using Nini.Config;
38using OpenSim.Framework; 38using OpenSim.Framework;
@@ -64,7 +64,7 @@ namespace OpenSim
64 /// <summary> 64 /// <summary>
65 /// The file used to load and save prim backup xml if no filename has been specified 65 /// The file used to load and save prim backup xml if no filename has been specified
66 /// </summary> 66 /// </summary>
67 protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; 67 protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.Xml";
68 68
69 /// <summary> 69 /// <summary>
70 /// The file used to load and save an opensim archive if no filename has been specified 70 /// The file used to load and save an opensim archive if no filename has been specified
@@ -178,17 +178,17 @@ namespace OpenSim
178 } 178 }
179 else 179 else
180 { 180 {
181 if (File.Exists("OpenSim.xml")) 181 if (File.Exists("OpenSim.Xml"))
182 { 182 {
183 //check for a xml config file 183 //check for a xml config file
184 Application.iniFilePath = "OpenSim.xml"; 184 Application.iniFilePath = "OpenSim.Xml";
185 m_config.Source = new XmlConfigSource(); 185 m_config.Source = new XmlConfigSource();
186 m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath)); 186 m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath));
187 m_config.Source.Merge(configSource); 187 m_config.Source.Merge(configSource);
188 } 188 }
189 else 189 else
190 { 190 {
191 //Application.iniFilePath = "OpenSim.xml"; 191 //Application.iniFilePath = "OpenSim.Xml";
192 // m_config.ConfigSource = new XmlConfigSource(); 192 // m_config.ConfigSource = new XmlConfigSource();
193 // no default config files, so set default values, and save it 193 // no default config files, so set default values, and save it
194 m_config.Source.Merge(DefaultConfig()); 194 m_config.Source.Merge(DefaultConfig());
@@ -437,7 +437,7 @@ namespace OpenSim
437 m_sceneManager.OnRestartSim += handleRestartRegion; 437 m_sceneManager.OnRestartSim += handleRestartRegion;
438 } 438 }
439 439
440 public LLUUID CreateUser(string tempfirstname, string templastname, string tempPasswd, uint regX, uint regY) 440 public UUID CreateUser(string tempfirstname, string templastname, string tempPasswd, uint regX, uint regY)
441 { 441 {
442 return m_commsManager.AddUser(tempfirstname, templastname, tempPasswd, regX, regY); 442 return m_commsManager.AddUser(tempfirstname, templastname, tempPasswd, regX, regY);
443 } 443 }
@@ -532,18 +532,18 @@ namespace OpenSim
532 // and has to happen before the region is registered with the grid. 532 // and has to happen before the region is registered with the grid.
533 scene.CreateTerrainTexture(false); 533 scene.CreateTerrainTexture(false);
534 534
535 try 535 //try
536 { 536 //{
537 scene.RegisterRegionWithGrid(); 537 scene.RegisterRegionWithGrid();
538 } 538 //}
539 catch (Exception e) 539 //catch (Exception e)
540 { 540 //{
541 m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e); 541 // m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e);
542 542
543 // Carrying on now causes a lot of confusion down the 543 // Carrying on now causes a lot of confusion down the
544 // line - we need to get the user's attention 544 // line - we need to get the user's attention
545 System.Environment.Exit(1); 545 // System.Environment.Exit(1);
546 } 546 //}
547 547
548 // We need to do this after we've initialized the 548 // We need to do this after we've initialized the
549 // scripting engines. 549 // scripting engines.