aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-11 18:02:22 +0000
committerJustin Clarke Casey2009-03-11 18:02:22 +0000
commitacad0328b2c50d22fe76ebb7c8de2c97c856b42f (patch)
tree2379c1ae60c22a4dcee162c5b56d21f367c05bfd
parent* Fix silly windows prebuild borkage. To use System.Xml, the project must ha... (diff)
downloadopensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.zip
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.gz
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.bz2
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.xz
* Make all coded defaults match settings in OpenSim.ini.example
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using * OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs2
-rw-r--r--OpenSim/Framework/Communications/GridInfoService.cs12
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs4
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs2
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs19
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs22
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs3
-rw-r--r--bin/OpenSim.ini.example108
17 files changed, 133 insertions, 69 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index 2ac1001..8ab9fd2 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -81,7 +81,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
81 internal static bool Secure = true; 81 internal static bool Secure = true;
82 internal static bool ExtendedEscape = true; 82 internal static bool ExtendedEscape = true;
83 internal static bool DumpAsset = false; 83 internal static bool DumpAsset = false;
84 internal static bool Fill = false; 84 internal static bool Fill = true;
85 internal static bool FlushEnabled = true; 85 internal static bool FlushEnabled = true;
86 internal static string Realm = "OpenSim REST"; 86 internal static string Realm = "OpenSim REST";
87 internal static string Scheme = AS_BASIC; 87 internal static string Scheme = AS_BASIC;
diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
index 488ce8e..bb54c1b 100644
--- a/OpenSim/Framework/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -102,9 +102,15 @@ namespace OpenSim.Framework.Communications
102 else if (null != netCfg) 102 else if (null != netCfg)
103 { 103 {
104 if (grid) 104 if (grid)
105 _info["login"] = netCfg.GetString("user_server_url"); 105 _info["login"]
106 else 106 = netCfg.GetString(
107 _info["login"] = String.Format("http://127.0.0.1:{0}/", netCfg.GetString("http_listener_port")); 107 "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
108 else
109 _info["login"]
110 = String.Format(
111 "http://127.0.0.1:{0}/",
112 netCfg.GetString("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort));
113
108 IssueWarning(); 114 IssueWarning();
109 } 115 }
110 else 116 else
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 49b8ef9..23b1627 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework
34 { 34 {
35 public static readonly uint DefaultHttpListenerPort = 9000; 35 public static readonly uint DefaultHttpListenerPort = 9000;
36 public static uint RemotingListenerPort = 8895; 36 public static uint RemotingListenerPort = 8895;
37 public string AssetSendKey = String.Empty; 37 public string AssetSendKey = String.Empty;
38 public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/"; 38 public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
39 39
40 public string GridRecvKey = String.Empty; 40 public string GridRecvKey = String.Empty;
@@ -85,7 +85,7 @@ namespace OpenSim.Framework
85 httpSSLPort = 85 httpSSLPort =
86 (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1)); 86 (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1));
87 HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); 87 HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
88 HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", ""); 88 HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
89 RemotingListenerPort = 89 RemotingListenerPort =
90 (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort); 90 (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
91 GridURL = 91 GridURL =
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 16bfbd8..5bd0fa5 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -115,7 +115,6 @@ namespace OpenSim.Framework.Servers
115 { 115 {
116 string httpMethod = handler.HttpMethod; 116 string httpMethod = handler.HttpMethod;
117 string path = handler.Path; 117 string path = handler.Path;
118
119 string handlerKey = GetHandlerKey(httpMethod, path); 118 string handlerKey = GetHandlerKey(httpMethod, path);
120 119
121 lock (m_streamHandlers) 120 lock (m_streamHandlers)
@@ -187,7 +186,6 @@ namespace OpenSim.Framework.Servers
187 // Note that the agent string is provided simply to differentiate 186 // Note that the agent string is provided simply to differentiate
188 // the handlers - it is NOT required to be an actual agent header 187 // the handlers - it is NOT required to be an actual agent header
189 // value. 188 // value.
190
191 public bool AddAgentHandler(string agent, IHttpAgentHandler handler) 189 public bool AddAgentHandler(string agent, IHttpAgentHandler handler)
192 { 190 {
193 lock (m_agentHandlers) 191 lock (m_agentHandlers)
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 7c335a7..8aa8dde 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -231,14 +231,14 @@ namespace OpenSim
231 if (null == config) 231 if (null == config)
232 config = defaultConfig.AddConfig("StandAlone"); 232 config = defaultConfig.AddConfig("StandAlone");
233 233
234 config.Set("accounts_authenticate", false); 234 config.Set("accounts_authenticate", true);
235 config.Set("welcome_message", "Welcome to OpenSimulator"); 235 config.Set("welcome_message", "Welcome to OpenSimulator");
236 config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll"); 236 config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
237 config.Set("inventory_source", ""); 237 config.Set("inventory_source", "");
238 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); 238 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
239 config.Set("user_source", ""); 239 config.Set("user_source", "");
240 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll"); 240 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
241 config.Set("asset_source", ""); 241 config.Set("asset_source", "URI=file:Asset.db,version=3");
242 config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar)); 242 config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
243 config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar)); 243 config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar));
244 config.Set("dump_assets_to_file", false); 244 config.Set("dump_assets_to_file", false);
@@ -288,11 +288,16 @@ namespace OpenSim
288 Thread.Sleep(3000); 288 Thread.Sleep(3000);
289 } 289 }
290 290
291 m_configSettings.StorageConnectionString = startupConfig.GetString("storage_connection_string"); 291 m_configSettings.StorageConnectionString
292 m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString); 292 = startupConfig.GetString("storage_connection_string");
293 m_configSettings.AssetStorage = startupConfig.GetString("asset_database"); 293 m_configSettings.EstateConnectionString
294 m_configSettings.AssetCache = startupConfig.GetString("AssetCache"); 294 = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
295 m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 295 m_configSettings.AssetStorage
296 = startupConfig.GetString("asset_database");
297 m_configSettings.AssetCache
298 = startupConfig.GetString("AssetCache", "OpenSim.Framework.Communications.Cache.AssetCache");
299 m_configSettings.ClientstackDll
300 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
296 } 301 }
297 302
298 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"]; 303 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];
diff --git a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 0a1de44..488e55b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
267 // Helpers.TryParse(EBA, out EconomyBaseAccount); 267 // Helpers.TryParse(EBA, out EconomyBaseAccount);
268 268
269 // UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1); 269 // UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1);
270 m_stipend = startupConfig.GetInt("UserStipend", 500); 270 m_stipend = startupConfig.GetInt("UserStipend", 1000);
271 m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10); 271 m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10);
272 m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true); 272 m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true);
273 m_MoneyAddress = startupConfig.GetString("CurrencyServer", String.Empty); 273 m_MoneyAddress = startupConfig.GetString("CurrencyServer", String.Empty);
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index aa33982..e5a01ef 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Communications.Local
55 { 55 {
56 IConfig startupConfig = config.Configs["Communications"]; 56 IConfig startupConfig = config.Configs["Communications"];
57 57
58 if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms")) 58 if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTComms") == "LocalComms"))
59 { 59 {
60 m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module"); 60 m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module");
61 m_enabled = true; 61 m_enabled = true;
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 08e08c8..63f3db5 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -111,8 +111,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
111 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); 111 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
112 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); 112 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
113 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); 113 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
114 maxlisteners = config.Configs["Chat"].GetInt("max_listens_per_region", maxlisteners); 114 maxlisteners = config.Configs["LL-Functions"].GetInt("max_listens_per_region", maxlisteners);
115 maxhandles = config.Configs["Chat"].GetInt("max_listens_per_script", maxhandles); 115 maxhandles = config.Configs["LL-Functions"].GetInt("max_listens_per_script", maxhandles);
116 } 116 }
117 catch (Exception) 117 catch (Exception)
118 { 118 {
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 11f7570..7b4a571 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
106 return; 106 return;
107 107
108 m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false); 108 m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false);
109 m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); 109 m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", false);
110 m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true); 110 m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true);
111 m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true); 111 m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true);
112 m_ParcelOwnerIsGod = myConfig.GetBoolean("parcel_owner_is_god", true); 112 m_ParcelOwnerIsGod = myConfig.GetBoolean("parcel_owner_is_god", true);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index 5b28430..d0211cd 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
74 byte[] imageData = null; 74 byte[] imageData = null;
75 75
76 bool drawPrimVolume = true; 76 bool drawPrimVolume = true;
77 bool textureTerrain = true; 77 bool textureTerrain = false;
78 78
79 try 79 try
80 { 80 {
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 3013971..bc7e7b2 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot
64 64
65 //DataServices and networking 65 //DataServices and networking
66 private string m_dataServices = "noservices"; 66 private string m_dataServices = "noservices";
67 public string m_listener_port = "9000"; //TODO: Set default port over 9000 67 public string m_listener_port = NetworkServersInfo.DefaultHttpListenerPort.ToString();
68 public string m_hostname = "127.0.0.1"; 68 public string m_hostname = "127.0.0.1";
69 69
70 //Update timers 70 //Update timers
@@ -101,14 +101,24 @@ namespace OpenSim.Region.DataSnapshot
101 try 101 try
102 { 102 {
103 m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled); 103 m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
104 if (config.Configs["Startup"].GetBoolean("gridmode", true)) 104 if (config.Configs["Startup"].GetBoolean("gridmode", false))
105 { 105 {
106 m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl")); 106 m_gridinfo.Add(
107 m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl")); 107 "gridserverURL",
108 m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl")); 108 config.Configs["Network"].GetString(
109 "grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()));
110 m_gridinfo.Add(
111 "userserverURL",
112 config.Configs["Network"].GetString(
113 "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()));
114 m_gridinfo.Add(
115 "assetserverURL",
116 config.Configs["Network"].GetString(
117 "asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()));
109 } 118 }
110 119
111 m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl")); 120 m_gridinfo.Add(
121 "Name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo"));
112 m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level); 122 m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level);
113 m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period); 123 m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
114 m_maxStales = config.Configs["DataSnapshot"].GetInt("max_changes_before_update", m_maxStales); 124 m_maxStales = config.Configs["DataSnapshot"].GetInt("max_changes_before_update", m_maxStales);
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 601cd82..732d99b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -366,8 +366,8 @@ namespace OpenSim.Region.Physics.OdePlugin
366 gravityy = physicsconfig.GetFloat("world_gravityy", 0f); 366 gravityy = physicsconfig.GetFloat("world_gravityy", 0f);
367 gravityz = physicsconfig.GetFloat("world_gravityz", -9.8f); 367 gravityz = physicsconfig.GetFloat("world_gravityz", -9.8f);
368 368
369 worldHashspaceLow = physicsconfig.GetInt("world_hashspace_low", -4); 369 worldHashspaceLow = physicsconfig.GetInt("world_hashspace_size_low", -4);
370 worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_high", 128); 370 worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_size_high", 128);
371 371
372 metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f); 372 metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f);
373 smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4); 373 smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4);
@@ -380,7 +380,7 @@ namespace OpenSim.Region.Physics.OdePlugin
380 nmTerrainContactERP = physicsconfig.GetFloat("nm_terraincontact_erp", 0.1025f); 380 nmTerrainContactERP = physicsconfig.GetFloat("nm_terraincontact_erp", 0.1025f);
381 381
382 mTerrainContactFriction = physicsconfig.GetFloat("m_terraincontact_friction", 75f); 382 mTerrainContactFriction = physicsconfig.GetFloat("m_terraincontact_friction", 75f);
383 mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.1f); 383 mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.05f);
384 mTerrainContactERP = physicsconfig.GetFloat("m_terraincontact_erp", 0.05025f); 384 mTerrainContactERP = physicsconfig.GetFloat("m_terraincontact_erp", 0.05025f);
385 385
386 nmAvatarObjectContactFriction = physicsconfig.GetFloat("objectcontact_friction", 250f); 386 nmAvatarObjectContactFriction = physicsconfig.GetFloat("objectcontact_friction", 250f);
@@ -411,7 +411,7 @@ namespace OpenSim.Region.Physics.OdePlugin
411 meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", true); 411 meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", true);
412 meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f); 412 meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f);
413 MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f); 413 MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f);
414 m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", true); 414 m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false);
415 415
416 if (Environment.OSVersion.Platform == PlatformID.Unix) 416 if (Environment.OSVersion.Platform == PlatformID.Unix)
417 { 417 {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 2ebc8b7..bb79da4 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -112,10 +112,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
112 /// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY. 112 /// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY.
113 /// </summary> 113 /// </summary>
114 public static long maxFunctionExecutionTimens; 114 public static long maxFunctionExecutionTimens;
115
115 /// <summary> 116 /// <summary>
116 /// Enforce max execution time 117 /// Enforce max execution time
117 /// </summary> 118 /// </summary>
118 public static bool EnforceMaxExecutionTime; 119 public static bool EnforceMaxExecutionTime;
120
119 /// <summary> 121 /// <summary>
120 /// Kill script (unload) when it exceeds execution time 122 /// Kill script (unload) when it exceeds execution time
121 /// </summary> 123 /// </summary>
@@ -163,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
163 // Refresh config 165 // Refresh config
164 numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2); 166 numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2);
165 maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000); 167 maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000);
166 EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", false); 168 EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", true);
167 KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false); 169 KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false);
168 EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300); 170 EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300);
169 171
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index bdf80c6..c2b07fc 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
171 171
172 public void ReadConfig() 172 public void ReadConfig()
173 { 173 {
174 RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30); 174 RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0);
175 175
176 if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig(); 176 if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig();
177 if (m_EventManager != null) m_EventManager.ReadConfig(); 177 if (m_EventManager != null) m_EventManager.ReadConfig();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 69d9c38..1ede395 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8717,7 +8717,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8717 IConfigSource config = new IniConfigSource(Application.iniFilePath); 8717 IConfigSource config = new IniConfigSource(Application.iniFilePath);
8718 if (config.Configs["Network"] != null) 8718 if (config.Configs["Network"] != null)
8719 { 8719 {
8720 shard = config.Configs["Network"].GetString("user_server_url", shard); 8720 shard
8721 = config.Configs["Network"].GetString(
8722 "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
8721 shard = config.Configs["Network"].GetString("shard", shard); 8723 shard = config.Configs["Network"].GetString("shard", shard);
8722 } 8724 }
8723 8725
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 041e751..6c8f3d0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
100 public void ReadConfig() 100 public void ReadConfig()
101 { 101 {
102 // Get some config 102 // Get some config
103 WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true); 103 WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", false);
104 CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true); 104 CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true);
105 105
106 // Get file prefix from scriptengine name and make it file system safe: 106 // Get file prefix from scriptengine name and make it file system safe:
@@ -187,7 +187,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
187 /// </summary> 187 /// </summary>
188 private void DeleteOldFiles() 188 private void DeleteOldFiles()
189 { 189 {
190
191 // CREATE FOLDER IF IT DOESNT EXIST 190 // CREATE FOLDER IF IT DOESNT EXIST
192 if (!Directory.Exists(ScriptEnginesPath)) 191 if (!Directory.Exists(ScriptEnginesPath))
193 { 192 {
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 681f967..ef72dc4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -236,7 +236,7 @@ InterregionComms = "RESTComms"
236 236
237[StandAlone] 237[StandAlone]
238 accounts_authenticate = true 238 accounts_authenticate = true
239 welcome_message = "Welcome to OpenSim" 239 welcome_message = "Welcome to OpenSimulator"
240 240
241 ; Asset database provider 241 ; Asset database provider
242 asset_plugin = "OpenSim.Data.SQLite.dll" 242 asset_plugin = "OpenSim.Data.SQLite.dll"
@@ -244,8 +244,8 @@ InterregionComms = "RESTComms"
244 ; asset_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate 244 ; asset_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
245 245
246 ; the Asset DB source. This only works for sqlite, mysql, and nhibernate for now 246 ; the Asset DB source. This only works for sqlite, mysql, and nhibernate for now
247 ; Asset Source SQLite example 247 ; Asset source SQLite example
248 ; asset_source = "URI=file:Asset.db,version=3" 248 asset_source = "URI=file:Asset.db,version=3"
249 ; Asset Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING) 249 ; Asset Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
250 ; asset_source = "SQLiteDialect;SqliteClientDriver;URI=file:Asset.db,version=3" 250 ; asset_source = "SQLiteDialect;SqliteClientDriver;URI=file:Asset.db,version=3"
251 ; Asset Source MySQL example 251 ; Asset Source MySQL example
@@ -256,12 +256,13 @@ InterregionComms = "RESTComms"
256 ; inventory_plugin = "OpenSim.Data.MySQL.dll" 256 ; inventory_plugin = "OpenSim.Data.MySQL.dll"
257 ; inventory_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate 257 ; inventory_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
258 258
259 ; Inventory source SQLite example
260 inventory_source = "URI=file:inventoryStore.db,version=3"
259 ; Inventory Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING) 261 ; Inventory Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
260 ; inventory_source = "SQLiteDialect;SqliteClientDriver;URI=file:Inventory.db,version=3" 262 ; inventory_source = "SQLiteDialect;SqliteClientDriver;URI=file:Inventory.db,version=3"
261 ; Inventory Source MySQL example 263 ; Inventory Source MySQL example
262 ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" 264 ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
263 265
264
265 ; User Data Database provider 266 ; User Data Database provider
266 ; 267 ;
267 ; Multiple providers can be specified by separating them with commas (whitespace is unimportant) 268 ; Multiple providers can be specified by separating them with commas (whitespace is unimportant)
@@ -274,6 +275,8 @@ InterregionComms = "RESTComms"
274 ; userDatabase_plugin = "OpenSim.Data.MySQL.dll" 275 ; userDatabase_plugin = "OpenSim.Data.MySQL.dll"
275 ; userDatabase_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate 276 ; userDatabase_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
276 277
278 ; User source SQLite example
279 user_source = "URI=file:userprofiles.db,version=3"
277 ; User Source NHibernate Example (DIALECT;DRIVER;CONNECTSTRING) 280 ; User Source NHibernate Example (DIALECT;DRIVER;CONNECTSTRING)
278 ; user_source = "SQLiteDialect;SqliteClientDriver;URI=file:User.db,version=3" 281 ; user_source = "SQLiteDialect;SqliteClientDriver;URI=file:User.db,version=3"
279 ; User Source MySQL example 282 ; User Source MySQL example
@@ -281,11 +284,11 @@ InterregionComms = "RESTComms"
281 284
282 ; Specifies the location and filename of the default inventory library control file. The path can be relative or absolute 285 ; Specifies the location and filename of the default inventory library control file. The path can be relative or absolute
283 ; Default is ./inventory/Libraries.xml 286 ; Default is ./inventory/Libraries.xml
284 ;LibrariesXMLFile="./inventory/Libraries.xml" 287 LibrariesXMLFile="./inventory/Libraries.xml"
285 288
286 ; Specifies the location and filename of the inventory library assets control file. The path can be relative or absolute 289 ; Specifies the location and filename of the inventory library assets control file. The path can be relative or absolute
287 ; Setting is optional. Default is ./assets/AssetSets.xml 290 ; Setting is optional. Default is ./assets/AssetSets.xml
288 ;AssetSetsXMLFile="./assets/AssetSets.xml" 291 AssetSetsXMLFile="./assets/AssetSets.xml"
289 292
290 dump_assets_to_file = false 293 dump_assets_to_file = false
291 294
@@ -416,18 +419,15 @@ InterregionComms = "RESTComms"
416 nm_terraincontact_erp = 0.1025 419 nm_terraincontact_erp = 0.1025
417 420
418 ; Moving Terrain Contact (avatar is moving) 421 ; Moving Terrain Contact (avatar is moving)
419
420 m_terraincontact_friction = 75.0 422 m_terraincontact_friction = 75.0
421 m_terraincontact_bounce = 0.05 423 m_terraincontact_bounce = 0.05
422 m_terrainContact_erp = 0.05025 424 m_terrainContact_erp = 0.05025
423 425
424 ; Moving Avatar to object Contact 426 ; Moving Avatar to object Contact
425
426 m_avatarobjectcontact_friction = 75.0 427 m_avatarobjectcontact_friction = 75.0
427 m_avatarobjectcontact_bounce = 0.1 428 m_avatarobjectcontact_bounce = 0.1
428 429
429 ; Object to Object Contact and Non-Moving Avatar to object 430 ; Object to Object Contact and Non-Moving Avatar to object
430
431 objectcontact_friction = 250.0 431 objectcontact_friction = 250.0
432 objectcontact_bounce = 0.2 432 objectcontact_bounce = 0.2
433 433
@@ -455,7 +455,6 @@ InterregionComms = "RESTComms"
455 ; used to calculate mass of avatar. 455 ; used to calculate mass of avatar.
456 ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH); 456 ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
457 ; av_density * AVvolume; 457 ; av_density * AVvolume;
458
459 av_density = 80 458 av_density = 80
460 459
461 ; use this value to cut 52% of the height the sim gives us 460 ; use this value to cut 52% of the height the sim gives us
@@ -516,6 +515,7 @@ InterregionComms = "RESTComms"
516 ; ## Physics logging settings - logfiles are saved to *.DIF files 515 ; ## Physics logging settings - logfiles are saved to *.DIF files
517 ; ## 516 ; ##
518 517
518 ; default is false
519 ;physics_logging = true 519 ;physics_logging = true
520 ;; every n simulation iterations, the physics snapshot file is updated 520 ;; every n simulation iterations, the physics snapshot file is updated
521 ;physics_logging_interval = 50 521 ;physics_logging_interval = 50
@@ -526,7 +526,9 @@ InterregionComms = "RESTComms"
526 ; ## Joint support 526 ; ## Joint support
527 ; ## 527 ; ##
528 528
529 ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true. (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics) 529 ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true.
530 ; (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
531 ; default is false
530 ;use_NINJA_physics_joints = true 532 ;use_NINJA_physics_joints = true
531 533
532 534
@@ -546,16 +548,18 @@ InterregionComms = "RESTComms"
546 region_file_template = "{0}x{1}-{2}.xml" 548 region_file_template = "{0}x{1}-{2}.xml"
547 549
548 ; we can limit the number of regions that XmlRpcCreateRegion will 550 ; we can limit the number of regions that XmlRpcCreateRegion will
549 ;allow by setting this to a positive, non-0 number: as long as the 551 ; allow by setting this to a positive, non-0 number: as long as the
550 ;number of regions is below region_limits, XmlRpcCreateRegion will 552 ; number of regions is below region_limits, XmlRpcCreateRegion will
551 ;succeed. setting region_limit to 0 disables the check. 553 ; succeed. setting region_limit to 0 disables the check.
554 ; default is 0
552 ;region_limit = 0 555 ;region_limit = 0
553 556
554 enabled_methods = all
555 ; enable only those methods you deem to be appropriate using a | delimited whitelist 557 ; enable only those methods you deem to be appropriate using a | delimited whitelist
556 ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml 558 ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml
557 ; if this parameter is not specified but enabled = true, all methods will be available 559 ; if this parameter is not specified but enabled = true, all methods will be available
560 enabled_methods = all
558 561
562
559[RestPlugins] 563[RestPlugins]
560 ; Change this to true to enable REST Plugins. This must be true if you wish to use 564 ; Change this to true to enable REST Plugins. This must be true if you wish to use
561 ; REST Region or REST Asset and Inventory Plugins 565 ; REST Region or REST Asset and Inventory Plugins
@@ -689,7 +693,6 @@ InterregionComms = "RESTComms"
689 ScriptDelayFactor = 1.0 693 ScriptDelayFactor = 1.0
690 ScriptDistanceLimitFactor = 1.0 694 ScriptDistanceLimitFactor = 1.0
691 695
692
693 ; 696 ;
694 ; These settings are specific to DotNetEngine script engine 697 ; These settings are specific to DotNetEngine script engine
695 ; Other script engines based on OpenSim.Region.ScriptEngine.Common.dll will have almost identical settings, but in another section of this config file. 698 ; Other script engines based on OpenSim.Region.ScriptEngine.Common.dll will have almost identical settings, but in another section of this config file.
@@ -780,10 +783,11 @@ InterregionComms = "RESTComms"
780 ; Async LL command sleep 783 ; Async LL command sleep
781 ; If no async LL commands are waiting, how long should thread sleep before checking again 784 ; If no async LL commands are waiting, how long should thread sleep before checking again
782 ; Async LL commands are LSL-commands that causes an event to be fired back with result 785 ; Async LL commands are LSL-commands that causes an event to be fired back with result
783 AsyncLLCommandLoopms=50 786 ; currently unused
787 ; AsyncLLCommandLoopms=50
784 788
785 ; When script is converted from LSL to C#, or just plain compiled, a copy of the script source will be put in the ScriptEngine folder 789 ; When script is converted from LSL to C#, or just plain compiled, a copy of the script source will be put in the ScriptEngine folder
786 WriteScriptSourceToDebugFile=true 790 WriteScriptSourceToDebugFile=false
787 791
788 ; Specify default script compiler 792 ; Specify default script compiler
789 ; If you do not specify //cs, //vb, //js or //lsl tag as the first characters of your script then the default compiler will be chosen 793 ; If you do not specify //cs, //vb, //js or //lsl tag as the first characters of your script then the default compiler will be chosen
@@ -796,18 +800,19 @@ InterregionComms = "RESTComms"
796 ; AllowedCompilers=lsl,cs,js,vb. *warning*, non lsl languages have access to static methods such as System.IO.File. Enable at your own risk. 800 ; AllowedCompilers=lsl,cs,js,vb. *warning*, non lsl languages have access to static methods such as System.IO.File. Enable at your own risk.
797 AllowedCompilers=lsl 801 AllowedCompilers=lsl
798 802
799
800 ; Compile scripts with debugging 803 ; Compile scripts with debugging
801 ; Probably a thousand times slower, but gives you a line number when something goes wrong. 804 ; Probably a thousand times slower, but gives you a line number when something goes wrong.
802 CompileWithDebugInformation=true 805 CompileWithDebugInformation=true
803 806
804 ; Remove old scripts on next startup 807 ; Remove old scripts on next startup
805 CleanUpOldScriptsOnStartup=true 808 ; currently unused
809 ;CleanUpOldScriptsOnStartup=true
806 810
807 811
808[LL-Functions] 812[LL-Functions]
809 ; Set the following to true to allow administrator owned scripts to execute console commands 813 ; Set the following to true to allow administrator owned scripts to execute console commands
810 AllowosConsoleCommand=false 814 ; currently unused
815 ; AllowosConsoleCommand=false
811 816
812 AllowGodFunctions = false 817 AllowGodFunctions = false
813 818
@@ -820,18 +825,24 @@ InterregionComms = "RESTComms"
820 ; The following set of configs pertains to search. 825 ; The following set of configs pertains to search.
821 ; Set index_sims to true to enable search engines to index your searchable data 826 ; Set index_sims to true to enable search engines to index your searchable data
822 ; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs 827 ; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs
828 ; default is false
823 index_sims = false 829 index_sims = false
830
824 ; The variable data_exposure controls what the regions expose: 831 ; The variable data_exposure controls what the regions expose:
825 ; minimum: exposes only things explicitly marked for search 832 ; minimum: exposes only things explicitly marked for search
826 ; all: exposes everything 833 ; all: exposes everything
827 data_exposure = minimum 834 data_exposure = minimum
835
828 ; If search is on, change this to your grid name; will be ignored for standalones 836 ; If search is on, change this to your grid name; will be ignored for standalones
829 gridname = "OSGrid" 837 gridname = "OSGrid"
838
830 ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast. 839 ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
831 ; Later, you may want to increase this to 3600 (1 hour) or more 840 ; Later, you may want to increase this to 3600 (1 hour) or more
832 default_snapshot_period = 1200 841 default_snapshot_period = 1200
842
833 ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots. 843 ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
834 snapshot_cache_directory = "DataSnapshot" 844 snapshot_cache_directory = "DataSnapshot"
845
835 ; This semicolon-separated string serves to notify specific data services about the existence 846 ; This semicolon-separated string serves to notify specific data services about the existence
836 ; of this sim. Uncomment if you want to index your data with this and/or other search providers. 847 ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
837 ;data_services="http://metaverseink.com/cgi-bin/register.py" 848 ;data_services="http://metaverseink.com/cgi-bin/register.py"
@@ -909,24 +920,35 @@ InterregionComms = "RESTComms"
909[XEngine] 920[XEngine]
910 ; Enable this engine in this OpenSim instance 921 ; Enable this engine in this OpenSim instance
911 Enabled = true 922 Enabled = true
923
912 ; How many threads to keep alive even if nothing is happening 924 ; How many threads to keep alive even if nothing is happening
913 MinThreads = 2 925 MinThreads = 2
926
914 ; How many threads to start at maximum load 927 ; How many threads to start at maximum load
915 MaxThreads = 100 928 MaxThreads = 100
929
916 ; Time a thread must be idle (in seconds) before it dies 930 ; Time a thread must be idle (in seconds) before it dies
917 IdleTimeout = 60 931 IdleTimeout = 60
932
918 ; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal", "Highest") 933 ; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal", "Highest")
919 Priority = "BelowNormal" 934 Priority = "BelowNormal"
935
920 ; Maximum number of events to queue for a script (excluding timers) 936 ; Maximum number of events to queue for a script (excluding timers)
921 MaxScriptEventQueue = 300 937 MaxScriptEventQueue = 300
938
922 ; Stack size per thread created 939 ; Stack size per thread created
923 ThreadStackSize = 262144 940 ThreadStackSize = 262144
941
924 ; Rate to poll for asynchronous command replies (ms) 942 ; Rate to poll for asynchronous command replies (ms)
925 AsyncLLCommandLoopms = 50 943 ; currently unused
944 ;AsyncLLCommandLoopms = 50
945
926 ; Save the source of all compiled scripts 946 ; Save the source of all compiled scripts
927 WriteScriptSourceToDebugFile = false 947 WriteScriptSourceToDebugFile = false
948
928 ; Default language for scripts 949 ; Default language for scripts
929 DefaultCompileLanguage = lsl 950 DefaultCompileLanguage = lsl
951
930 ; List of allowed languages (lsl,vb,js,cs) 952 ; List of allowed languages (lsl,vb,js,cs)
931 ; AllowedCompilers=lsl,cs,js,vb. 953 ; AllowedCompilers=lsl,cs,js,vb.
932 ; *warning*, non lsl languages have access to static methods such as System.IO.File. Enable at your own risk. 954 ; *warning*, non lsl languages have access to static methods such as System.IO.File. Enable at your own risk.
@@ -934,20 +956,28 @@ InterregionComms = "RESTComms"
934 956
935 ; Compile debug info (line numbers) into the script assemblies 957 ; Compile debug info (line numbers) into the script assemblies
936 CompileWithDebugInformation = true 958 CompileWithDebugInformation = true
959
937 ; Allow the use of os* functions (some are dangerous) 960 ; Allow the use of os* functions (some are dangerous)
938 AllowOSFunctions = false 961 AllowOSFunctions = false
962
939 ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe 963 ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
940 OSFunctionThreatLevel = VeryLow 964 OSFunctionThreatLevel = VeryLow
965
941 ; Interval (s) between background save of script states 966 ; Interval (s) between background save of script states
942 SaveInterval = 120 967 SaveInterval = 120
968
943 ; Interval (s) between maintenance runs (0 = disable) 969 ; Interval (s) between maintenance runs (0 = disable)
944 MaintenanceInterval = 10 970 MaintenanceInterval = 10
971
945 ; Time a script can spend in an event handler before it is interrupted 972 ; Time a script can spend in an event handler before it is interrupted
946 EventLimit = 30 973 EventLimit = 30
974
947 ; If a script overruns it's event limit, kill the script? 975 ; If a script overruns it's event limit, kill the script?
948 KillTimedOutScripts = false 976 KillTimedOutScripts = false
977
949 ; Sets the multiplier for the scripting delays 978 ; Sets the multiplier for the scripting delays
950 ScriptDelayFactor = 1.0 979 ScriptDelayFactor = 1.0
980
951 ; The factor the 10 m distances llimits are multiplied by 981 ; The factor the 10 m distances llimits are multiplied by
952 ScriptDistanceLimitFactor = 1.0 982 ScriptDistanceLimitFactor = 1.0
953 983
@@ -964,11 +994,11 @@ InterregionComms = "RESTComms"
964 ; Comma separated list of UUIDS allows the function for that list of UUIDS 994 ; Comma separated list of UUIDS allows the function for that list of UUIDS
965 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb 995 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
966 996
967
968 ; Allow for llCreateLink and llBreakLink to work without asking for permission 997 ; Allow for llCreateLink and llBreakLink to work without asking for permission
969 ; only enable this in a trusted environment otherwise you may be subject to hijacking 998 ; only enable this in a trusted environment otherwise you may be subject to hijacking
970 ; AutomaticLinkPermission = false 999 ; AutomaticLinkPermission = false
971 1000
1001
972[GridInfo] 1002[GridInfo]
973 ; These settings are used to return information on a get_grid_info call. 1003 ; These settings are used to return information on a get_grid_info call.
974 ; Client launcher scripts and third-party clients make use of this to 1004 ; Client launcher scripts and third-party clients make use of this to
@@ -987,30 +1017,36 @@ InterregionComms = "RESTComms"
987 ; short grid name: the short name of your grid 1017 ; short grid name: the short name of your grid
988 gridnick = "hippogrid" 1018 gridnick = "hippogrid"
989 1019
990
991 ; login page: optional: if it exists it will be used to tell the client to use 1020 ; login page: optional: if it exists it will be used to tell the client to use
992 ; this as splash page 1021 ; this as splash page
993 welcome = http://127.0.0.1/welcome 1022 ; currently unused
1023 ;welcome = http://127.0.0.1/welcome
994 1024
995 ; helper uri: optional: if it exists if will be used to tell the client to use 1025 ; helper uri: optional: if it exists if will be used to tell the client to use
996 ; this for all economy related things 1026 ; this for all economy related things
997 economy = http://127.0.0.1:9000/ 1027 ; currently unused
1028 ;economy = http://127.0.0.1:9000/
998 1029
999 ; web page of grid: optional: page providing further information about your grid 1030 ; web page of grid: optional: page providing further information about your grid
1000 about = http://127.0.0.1/about/ 1031 ; currently unused
1032 ;about = http://127.0.0.1/about/
1001 1033
1002 ; account creation: optional: page providing further information about obtaining 1034 ; account creation: optional: page providing further information about obtaining
1003 ; a user account on your grid 1035 ; a user account on your grid
1004 register = http://127.0.0.1/register 1036 ; currently unused
1037 ;register = http://127.0.0.1/register
1005 1038
1006 ; help: optional: page providing further assistance for users of your grid 1039 ; help: optional: page providing further assistance for users of your grid
1007 help = http://127.0.0.1/help 1040 ; currently unused
1041 ;help = http://127.0.0.1/help
1008 1042
1009 ; password help: optional: page providing password assistance for users of your grid 1043 ; password help: optional: page providing password assistance for users of your grid
1010 password = http://127.0.0.1/password 1044 ; currently unused
1045 ;password = http://127.0.0.1/password
1011 1046
1047
1048[OpenGridProtocol]
1012 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know.. 1049 ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
1013 [OpenGridProtocol]
1014 ;On/true or Off/false 1050 ;On/true or Off/false
1015 ogp_enabled=false 1051 ogp_enabled=false
1016 1052
@@ -1049,16 +1085,19 @@ InterregionComms = "RESTComms"
1049 ; {1} is replaced with the region's UUID 1085 ; {1} is replaced with the region's UUID
1050 broker = "http://broker.place.com/{1}" 1086 broker = "http://broker.place.com/{1}"
1051 1087
1052[Trees]
1053 1088
1089[Trees]
1054 ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying 1090 ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
1091 ; default is false
1055 active_trees = false 1092 active_trees = false
1056 1093
1057 ; Density of tree population 1094 ; Density of tree population
1058 tree_density = 1000.0 1095 tree_density = 1000.0
1059 1096
1097
1060[RegionReady] 1098[RegionReady]
1061 ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled 1099 ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
1100 ; default is false
1062 enabled = false 1101 enabled = false
1063 1102
1064 ; Channel on which to signal region readiness through a message 1103 ; Channel on which to signal region readiness through a message
@@ -1068,5 +1107,8 @@ InterregionComms = "RESTComms"
1068 ; - "oar error" if supplied, provides the error message from the OAR load 1107 ; - "oar error" if supplied, provides the error message from the OAR load
1069 channel_notify = -800 1108 channel_notify = -800
1070 1109
1110
1071[MRM] 1111[MRM]
1072 Enabled = false ; Enables the Mini Region Modules Script Engine. WARNING: SECURITY RISK. 1112 ; Enables the Mini Region Modules Script Engine. WARNING: SECURITY RISK.
1113 ; default is false
1114 Enabled = false