aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2014-04-25 21:34:29 +0100
committerMelanie2014-04-25 21:34:29 +0100
commita108fcac957dd2283fb8904207addda6dc7582f0 (patch)
tree9ac4b3fb57273ae32f67c8c9878adb74d9fc8593 /OpenSim/Region
parentAdjust permissions to work hand in hand with what the viewer believes they are. (diff)
downloadopensim-SC_OLD-a108fcac957dd2283fb8904207addda6dc7582f0.zip
opensim-SC_OLD-a108fcac957dd2283fb8904207addda6dc7582f0.tar.gz
opensim-SC_OLD-a108fcac957dd2283fb8904207addda6dc7582f0.tar.bz2
opensim-SC_OLD-a108fcac957dd2283fb8904207addda6dc7582f0.tar.xz
Restore overload mode accidentally disabled in a prior commit. Add a new
config option, LogOverloads, to log when a thread pool overload occurs. This option defaults to "True" because the logging data is useful for diagnosing threading issues.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 9d36986..feb3cf8 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -154,6 +154,12 @@ namespace OpenSim
154 proxyUrl = networkConfig.GetString("proxy_url", ""); 154 proxyUrl = networkConfig.GetString("proxy_url", "");
155 proxyOffset = Int32.Parse(networkConfig.GetString("proxy_offset", "0")); 155 proxyOffset = Int32.Parse(networkConfig.GetString("proxy_offset", "0"));
156 } 156 }
157
158 IConfig startupConfig = Config.Configs["Startup"];
159 if (startupConfig != null)
160 {
161 Util.LogOverloads = startupConfig.GetBoolean("LogOverloads", true);
162 }
157 } 163 }
158 164
159 protected virtual void LoadPlugins() 165 protected virtual void LoadPlugins()