aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTedd Hansen2008-02-02 07:35:51 +0000
committerTedd Hansen2008-02-02 07:35:51 +0000
commit2db5de3e7217ca4bd9fcaf5345ea5672b5d6663f (patch)
tree933067db00bb5a76447802aadc6405094ed6b673 /OpenSim/Framework
parentUpdated svn properties. (diff)
downloadopensim-SC-2db5de3e7217ca4bd9fcaf5345ea5672b5d6663f.zip
opensim-SC-2db5de3e7217ca4bd9fcaf5345ea5672b5d6663f.tar.gz
opensim-SC-2db5de3e7217ca4bd9fcaf5345ea5672b5d6663f.tar.bz2
opensim-SC-2db5de3e7217ca4bd9fcaf5345ea5672b5d6663f.tar.xz
Added commands to change config file from console:
CONFIG SET section key value value value CONFIG GET section key CONFIG SAVE (it saves, but does it save correctly?:) ScriptEngine will react correctly to any config change made while it is running.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs16
-rw-r--r--OpenSim/Framework/RegionInfo.cs2
2 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index 45d0720..b25924c 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -415,11 +415,12 @@ namespace OpenSim.Framework.Data.MySQL
415 } 415 }
416 } 416 }
417 417
418 static Random rnd = new Random();
418 public void StoreLandObject(Land parcel, LLUUID regionUUID) 419 public void StoreLandObject(Land parcel, LLUUID regionUUID)
419 { 420 {
420 // Does the new locking fix it? 421 // Does the new locking fix it?
421 //MainLog.Instance.Verbose("DATASTORE", "Tedds temp fix: Waiting 3 seconds for stuff to catch up. (Someone please fix! :))"); 422 MainLog.Instance.Verbose("DATASTORE", "Tedds temp fix: Waiting 3 seconds for stuff to catch up. (Someone please fix! :))");
422 //System.Threading.Thread.Sleep(3000); 423 System.Threading.Thread.Sleep(2500 + rnd.Next(300, 900));
423 424
424 lock (DBAccessLock) 425 lock (DBAccessLock)
425 { 426 {
@@ -1469,7 +1470,16 @@ namespace OpenSim.Framework.Data.MySQL
1469 1470
1470 if (conn.State != ConnectionState.Open) 1471 if (conn.State != ConnectionState.Open)
1471 { 1472 {
1472 conn.Open(); 1473 try
1474 {
1475 conn.Open();
1476 }
1477 catch (Exception ex)
1478 {
1479 MainLog.Instance.Error("MySql", "Error connecting to MySQL server: " + ex.Message);
1480 MainLog.Instance.Error("MySql", "Application is terminating!");
1481 System.Threading.Thread.CurrentThread.Abort();
1482 }
1473 } 1483 }
1474 1484
1475 try 1485 try
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index b843774..be0b3e0 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Framework
310 NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); 310 NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
311 configMember.addConfigurationOption("allow_alternate_ports", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 311 configMember.addConfigurationOption("allow_alternate_ports", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
312 "Allow sim to find alternate UDP ports when ports are in use?", 312 "Allow sim to find alternate UDP ports when ports are in use?",
313 "false", false); 313 "false", true);
314 configMember.addConfigurationOption("external_host_name", 314 configMember.addConfigurationOption("external_host_name",
315 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 315 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
316 "External Host Name", "127.0.0.1", false); 316 "External Host Name", "127.0.0.1", false);