diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
index 2ac10011eb..8ab9fd23a1 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
@@ -81,7 +81,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
internal static bool Secure = true;
internal static bool ExtendedEscape = true;
internal static bool DumpAsset = false;
- internal static bool Fill = false;
+ internal static bool Fill = true;
internal static bool FlushEnabled = true;
internal static string Realm = "OpenSim REST";
internal static string Scheme = AS_BASIC;
diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
index 488ce8eb2d..bb54c1b09f 100644
--- a/OpenSim/Framework/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -102,9 +102,15 @@ namespace OpenSim.Framework.Communications
else if (null != netCfg)
{
if (grid)
- _info["login"] = netCfg.GetString("user_server_url");
- else
- _info["login"] = String.Format("http://127.0.0.1:{0}/", netCfg.GetString("http_listener_port"));
+ _info["login"]
+ = netCfg.GetString(
+ "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
+ else
+ _info["login"]
+ = String.Format(
+ "http://127.0.0.1:{0}/",
+ netCfg.GetString("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort));
+
IssueWarning();
}
else
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 49b8ef9110..23b16270e6 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework
{
public static readonly uint DefaultHttpListenerPort = 9000;
public static uint RemotingListenerPort = 8895;
- public string AssetSendKey = String.Empty;
+ public string AssetSendKey = String.Empty;
public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
public string GridRecvKey = String.Empty;
@@ -85,7 +85,7 @@ namespace OpenSim.Framework
httpSSLPort =
(uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1));
HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
- HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "");
+ HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
RemotingListenerPort =
(uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
GridURL =
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 16bfbd89ae..5bd0fa5bc3 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -115,7 +115,6 @@ namespace OpenSim.Framework.Servers
{
string httpMethod = handler.HttpMethod;
string path = handler.Path;
-
string handlerKey = GetHandlerKey(httpMethod, path);
lock (m_streamHandlers)
@@ -187,7 +186,6 @@ namespace OpenSim.Framework.Servers
// Note that the agent string is provided simply to differentiate
// the handlers - it is NOT required to be an actual agent header
// value.
-
public bool AddAgentHandler(string agent, IHttpAgentHandler handler)
{
lock (m_agentHandlers)
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 7c335a7027..8aa8ddecc7 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -231,14 +231,14 @@ namespace OpenSim
if (null == config)
config = defaultConfig.AddConfig("StandAlone");
- config.Set("accounts_authenticate", false);
+ config.Set("accounts_authenticate", true);
config.Set("welcome_message", "Welcome to OpenSimulator");
config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
config.Set("inventory_source", "");
config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
config.Set("user_source", "");
config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
- config.Set("asset_source", "");
+ config.Set("asset_source", "URI=file:Asset.db,version=3");
config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar));
config.Set("dump_assets_to_file", false);
@@ -288,11 +288,16 @@ namespace OpenSim
Thread.Sleep(3000);
}
- m_configSettings.StorageConnectionString = startupConfig.GetString("storage_connection_string");
- m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
- m_configSettings.AssetStorage = startupConfig.GetString("asset_database");
- m_configSettings.AssetCache = startupConfig.GetString("AssetCache");
- m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
+ m_configSettings.StorageConnectionString
+ = startupConfig.GetString("storage_connection_string");
+ m_configSettings.EstateConnectionString
+ = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
+ m_configSettings.AssetStorage
+ = startupConfig.GetString("asset_database");
+ m_configSettings.AssetCache
+ = startupConfig.GetString("AssetCache", "OpenSim.Framework.Communications.Cache.AssetCache");
+ m_configSettings.ClientstackDll
+ = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
}
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 0a1de44694..488e55be74 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
// Helpers.TryParse(EBA, out EconomyBaseAccount);
// UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1);
- m_stipend = startupConfig.GetInt("UserStipend", 500);
+ m_stipend = startupConfig.GetInt("UserStipend", 1000);
m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10);
m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true);
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 aa33982d1c..e5a01ef8b9 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
{
IConfig startupConfig = config.Configs["Communications"];
- if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
+ if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTComms") == "LocalComms"))
{
m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module");
m_enabled = true;
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 08e08c8ebe..63f3db5639 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
m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
- maxlisteners = config.Configs["Chat"].GetInt("max_listens_per_region", maxlisteners);
- maxhandles = config.Configs["Chat"].GetInt("max_listens_per_script", maxhandles);
+ maxlisteners = config.Configs["LL-Functions"].GetInt("max_listens_per_region", maxlisteners);
+ maxhandles = config.Configs["LL-Functions"].GetInt("max_listens_per_script", maxhandles);
}
catch (Exception)
{
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 11f7570593..7b4a571094 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
return;
m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false);
- m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
+ m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", false);
m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true);
m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true);
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 5b284301e6..d0211cde58 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
byte[] imageData = null;
bool drawPrimVolume = true;
- bool textureTerrain = true;
+ bool textureTerrain = false;
try
{
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 30139717df..bc7e7b20bf 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot
//DataServices and networking
private string m_dataServices = "noservices";
- public string m_listener_port = "9000"; //TODO: Set default port over 9000
+ public string m_listener_port = NetworkServersInfo.DefaultHttpListenerPort.ToString();
public string m_hostname = "127.0.0.1";
//Update timers
@@ -101,14 +101,24 @@ namespace OpenSim.Region.DataSnapshot
try
{
m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
- if (config.Configs["Startup"].GetBoolean("gridmode", true))
+ if (config.Configs["Startup"].GetBoolean("gridmode", false))
{
- m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl"));
- m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl"));
- m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl"));
+ m_gridinfo.Add(
+ "gridserverURL",
+ config.Configs["Network"].GetString(
+ "grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()));
+ m_gridinfo.Add(
+ "userserverURL",
+ config.Configs["Network"].GetString(
+ "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()));
+ m_gridinfo.Add(
+ "assetserverURL",
+ config.Configs["Network"].GetString(
+ "asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()));
}
- m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl"));
+ m_gridinfo.Add(
+ "Name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo"));
m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level);
m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
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 601cd8259b..732d99b09a 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -366,8 +366,8 @@ namespace OpenSim.Region.Physics.OdePlugin
gravityy = physicsconfig.GetFloat("world_gravityy", 0f);
gravityz = physicsconfig.GetFloat("world_gravityz", -9.8f);
- worldHashspaceLow = physicsconfig.GetInt("world_hashspace_low", -4);
- worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_high", 128);
+ worldHashspaceLow = physicsconfig.GetInt("world_hashspace_size_low", -4);
+ worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_size_high", 128);
metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f);
smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4);
@@ -380,7 +380,7 @@ namespace OpenSim.Region.Physics.OdePlugin
nmTerrainContactERP = physicsconfig.GetFloat("nm_terraincontact_erp", 0.1025f);
mTerrainContactFriction = physicsconfig.GetFloat("m_terraincontact_friction", 75f);
- mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.1f);
+ mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.05f);
mTerrainContactERP = physicsconfig.GetFloat("m_terraincontact_erp", 0.05025f);
nmAvatarObjectContactFriction = physicsconfig.GetFloat("objectcontact_friction", 250f);
@@ -411,7 +411,7 @@ namespace OpenSim.Region.Physics.OdePlugin
meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", true);
meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f);
MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f);
- m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", true);
+ m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false);
if (Environment.OSVersion.Platform == PlatformID.Unix)
{
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 2ebc8b731d..bb79da4b39 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -112,10 +112,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
/// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY.
///
public static long maxFunctionExecutionTimens;
+
///
/// Enforce max execution time
///
public static bool EnforceMaxExecutionTime;
+
///
/// Kill script (unload) when it exceeds execution time
///
@@ -163,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
// Refresh config
numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2);
maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000);
- EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", false);
+ EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", true);
KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false);
EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300);
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index bdf80c6f13..c2b07fc594 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
public void ReadConfig()
{
- RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30);
+ RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0);
if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig();
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 69d9c386d1..1ede395a87 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
IConfigSource config = new IniConfigSource(Application.iniFilePath);
if (config.Configs["Network"] != null)
{
- shard = config.Configs["Network"].GetString("user_server_url", shard);
+ shard
+ = config.Configs["Network"].GetString(
+ "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
shard = config.Configs["Network"].GetString("shard", shard);
}
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 041e751fba..6c8f3d0dd4 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
public void ReadConfig()
{
// Get some config
- WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true);
+ WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", false);
CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true);
// Get file prefix from scriptengine name and make it file system safe:
@@ -187,7 +187,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
///
private void DeleteOldFiles()
{
-
// CREATE FOLDER IF IT DOESNT EXIST
if (!Directory.Exists(ScriptEnginesPath))
{
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 681f967352..ef72dc4dce 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -236,7 +236,7 @@ InterregionComms = "RESTComms"
[StandAlone]
accounts_authenticate = true
- welcome_message = "Welcome to OpenSim"
+ welcome_message = "Welcome to OpenSimulator"
; Asset database provider
asset_plugin = "OpenSim.Data.SQLite.dll"
@@ -244,8 +244,8 @@ InterregionComms = "RESTComms"
; asset_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
; the Asset DB source. This only works for sqlite, mysql, and nhibernate for now
- ; Asset Source SQLite example
- ; asset_source = "URI=file:Asset.db,version=3"
+ ; Asset source SQLite example
+ asset_source = "URI=file:Asset.db,version=3"
; Asset Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
; asset_source = "SQLiteDialect;SqliteClientDriver;URI=file:Asset.db,version=3"
; Asset Source MySQL example
@@ -256,12 +256,13 @@ InterregionComms = "RESTComms"
; inventory_plugin = "OpenSim.Data.MySQL.dll"
; inventory_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
+ ; Inventory source SQLite example
+ inventory_source = "URI=file:inventoryStore.db,version=3"
; Inventory Source NHibernate example (DIALECT;DRIVER;CONNECTSTRING)
; inventory_source = "SQLiteDialect;SqliteClientDriver;URI=file:Inventory.db,version=3"
; Inventory Source MySQL example
;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
-
; User Data Database provider
;
; Multiple providers can be specified by separating them with commas (whitespace is unimportant)
@@ -274,6 +275,8 @@ InterregionComms = "RESTComms"
; userDatabase_plugin = "OpenSim.Data.MySQL.dll"
; userDatabase_plugin = "OpenSim.Data.NHibernate.dll" ; for nhibernate
+ ; User source SQLite example
+ user_source = "URI=file:userprofiles.db,version=3"
; User Source NHibernate Example (DIALECT;DRIVER;CONNECTSTRING)
; user_source = "SQLiteDialect;SqliteClientDriver;URI=file:User.db,version=3"
; User Source MySQL example
@@ -281,11 +284,11 @@ InterregionComms = "RESTComms"
; Specifies the location and filename of the default inventory library control file. The path can be relative or absolute
; Default is ./inventory/Libraries.xml
- ;LibrariesXMLFile="./inventory/Libraries.xml"
+ LibrariesXMLFile="./inventory/Libraries.xml"
; Specifies the location and filename of the inventory library assets control file. The path can be relative or absolute
; Setting is optional. Default is ./assets/AssetSets.xml
- ;AssetSetsXMLFile="./assets/AssetSets.xml"
+ AssetSetsXMLFile="./assets/AssetSets.xml"
dump_assets_to_file = false
@@ -416,18 +419,15 @@ InterregionComms = "RESTComms"
nm_terraincontact_erp = 0.1025
; Moving Terrain Contact (avatar is moving)
-
m_terraincontact_friction = 75.0
m_terraincontact_bounce = 0.05
m_terrainContact_erp = 0.05025
; Moving Avatar to object Contact
-
m_avatarobjectcontact_friction = 75.0
m_avatarobjectcontact_bounce = 0.1
; Object to Object Contact and Non-Moving Avatar to object
-
objectcontact_friction = 250.0
objectcontact_bounce = 0.2
@@ -455,7 +455,6 @@ InterregionComms = "RESTComms"
; used to calculate mass of avatar.
; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
; av_density * AVvolume;
-
av_density = 80
; use this value to cut 52% of the height the sim gives us
@@ -516,6 +515,7 @@ InterregionComms = "RESTComms"
; ## Physics logging settings - logfiles are saved to *.DIF files
; ##
+ ; default is false
;physics_logging = true
;; every n simulation iterations, the physics snapshot file is updated
;physics_logging_interval = 50
@@ -526,7 +526,9 @@ InterregionComms = "RESTComms"
; ## Joint support
; ##
- ; 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)
+ ; 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)
+ ; default is false
;use_NINJA_physics_joints = true
@@ -546,16 +548,18 @@ InterregionComms = "RESTComms"
region_file_template = "{0}x{1}-{2}.xml"
; we can limit the number of regions that XmlRpcCreateRegion will
- ;allow by setting this to a positive, non-0 number: as long as the
- ;number of regions is below region_limits, XmlRpcCreateRegion will
- ;succeed. setting region_limit to 0 disables the check.
+ ; allow by setting this to a positive, non-0 number: as long as the
+ ; number of regions is below region_limits, XmlRpcCreateRegion will
+ ; succeed. setting region_limit to 0 disables the check.
+ ; default is 0
;region_limit = 0
- enabled_methods = all
; enable only those methods you deem to be appropriate using a | delimited whitelist
; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml
; if this parameter is not specified but enabled = true, all methods will be available
+ enabled_methods = all
+
[RestPlugins]
; Change this to true to enable REST Plugins. This must be true if you wish to use
; REST Region or REST Asset and Inventory Plugins
@@ -689,7 +693,6 @@ InterregionComms = "RESTComms"
ScriptDelayFactor = 1.0
ScriptDistanceLimitFactor = 1.0
-
;
; These settings are specific to DotNetEngine script engine
; 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"
; Async LL command sleep
; If no async LL commands are waiting, how long should thread sleep before checking again
; Async LL commands are LSL-commands that causes an event to be fired back with result
- AsyncLLCommandLoopms=50
+ ; currently unused
+ ; AsyncLLCommandLoopms=50
; 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
- WriteScriptSourceToDebugFile=true
+ WriteScriptSourceToDebugFile=false
; Specify default script compiler
; 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"
; AllowedCompilers=lsl,cs,js,vb. *warning*, non lsl languages have access to static methods such as System.IO.File. Enable at your own risk.
AllowedCompilers=lsl
-
; Compile scripts with debugging
; Probably a thousand times slower, but gives you a line number when something goes wrong.
CompileWithDebugInformation=true
; Remove old scripts on next startup
- CleanUpOldScriptsOnStartup=true
+ ; currently unused
+ ;CleanUpOldScriptsOnStartup=true
[LL-Functions]
; Set the following to true to allow administrator owned scripts to execute console commands
- AllowosConsoleCommand=false
+ ; currently unused
+ ; AllowosConsoleCommand=false
AllowGodFunctions = false
@@ -820,18 +825,24 @@ InterregionComms = "RESTComms"
; The following set of configs pertains to search.
; Set index_sims to true to enable search engines to index your searchable data
; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs
+ ; default is false
index_sims = false
+
; The variable data_exposure controls what the regions expose:
; minimum: exposes only things explicitly marked for search
; all: exposes everything
data_exposure = minimum
+
; If search is on, change this to your grid name; will be ignored for standalones
gridname = "OSGrid"
+
; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
; Later, you may want to increase this to 3600 (1 hour) or more
default_snapshot_period = 1200
+
; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
snapshot_cache_directory = "DataSnapshot"
+
; This semicolon-separated string serves to notify specific data services about the existence
; of this sim. Uncomment if you want to index your data with this and/or other search providers.
;data_services="http://metaverseink.com/cgi-bin/register.py"
@@ -909,24 +920,35 @@ InterregionComms = "RESTComms"
[XEngine]
; Enable this engine in this OpenSim instance
Enabled = true
+
; How many threads to keep alive even if nothing is happening
MinThreads = 2
+
; How many threads to start at maximum load
MaxThreads = 100
+
; Time a thread must be idle (in seconds) before it dies
IdleTimeout = 60
+
; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal", "Highest")
Priority = "BelowNormal"
+
; Maximum number of events to queue for a script (excluding timers)
MaxScriptEventQueue = 300
+
; Stack size per thread created
ThreadStackSize = 262144
+
; Rate to poll for asynchronous command replies (ms)
- AsyncLLCommandLoopms = 50
+ ; currently unused
+ ;AsyncLLCommandLoopms = 50
+
; Save the source of all compiled scripts
WriteScriptSourceToDebugFile = false
+
; Default language for scripts
DefaultCompileLanguage = lsl
+
; List of allowed languages (lsl,vb,js,cs)
; AllowedCompilers=lsl,cs,js,vb.
; *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"
; Compile debug info (line numbers) into the script assemblies
CompileWithDebugInformation = true
+
; Allow the use of os* functions (some are dangerous)
AllowOSFunctions = false
+
; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
OSFunctionThreatLevel = VeryLow
+
; Interval (s) between background save of script states
SaveInterval = 120
+
; Interval (s) between maintenance runs (0 = disable)
MaintenanceInterval = 10
+
; Time a script can spend in an event handler before it is interrupted
EventLimit = 30
+
; If a script overruns it's event limit, kill the script?
KillTimedOutScripts = false
+
; Sets the multiplier for the scripting delays
ScriptDelayFactor = 1.0
+
; The factor the 10 m distances llimits are multiplied by
ScriptDistanceLimitFactor = 1.0
@@ -964,11 +994,11 @@ InterregionComms = "RESTComms"
; Comma separated list of UUIDS allows the function for that list of UUIDS
; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
-
; Allow for llCreateLink and llBreakLink to work without asking for permission
; only enable this in a trusted environment otherwise you may be subject to hijacking
; AutomaticLinkPermission = false
+
[GridInfo]
; These settings are used to return information on a get_grid_info call.
; Client launcher scripts and third-party clients make use of this to
@@ -987,30 +1017,36 @@ InterregionComms = "RESTComms"
; short grid name: the short name of your grid
gridnick = "hippogrid"
-
; login page: optional: if it exists it will be used to tell the client to use
; this as splash page
- welcome = http://127.0.0.1/welcome
+ ; currently unused
+ ;welcome = http://127.0.0.1/welcome
; helper uri: optional: if it exists if will be used to tell the client to use
; this for all economy related things
- economy = http://127.0.0.1:9000/
+ ; currently unused
+ ;economy = http://127.0.0.1:9000/
; web page of grid: optional: page providing further information about your grid
- about = http://127.0.0.1/about/
+ ; currently unused
+ ;about = http://127.0.0.1/about/
; account creation: optional: page providing further information about obtaining
; a user account on your grid
- register = http://127.0.0.1/register
+ ; currently unused
+ ;register = http://127.0.0.1/register
; help: optional: page providing further assistance for users of your grid
- help = http://127.0.0.1/help
+ ; currently unused
+ ;help = http://127.0.0.1/help
; password help: optional: page providing password assistance for users of your grid
- password = http://127.0.0.1/password
+ ; currently unused
+ ;password = http://127.0.0.1/password
+
+[OpenGridProtocol]
;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
- [OpenGridProtocol]
;On/true or Off/false
ogp_enabled=false
@@ -1049,16 +1085,19 @@ InterregionComms = "RESTComms"
; {1} is replaced with the region's UUID
broker = "http://broker.place.com/{1}"
-[Trees]
+[Trees]
; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
+ ; default is false
active_trees = false
; Density of tree population
tree_density = 1000.0
+
[RegionReady]
; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
+ ; default is false
enabled = false
; Channel on which to signal region readiness through a message
@@ -1068,5 +1107,8 @@ InterregionComms = "RESTComms"
; - "oar error" if supplied, provides the error message from the OAR load
channel_notify = -800
+
[MRM]
- Enabled = false ; Enables the Mini Region Modules Script Engine. WARNING: SECURITY RISK.
+ ; Enables the Mini Region Modules Script Engine. WARNING: SECURITY RISK.
+ ; default is false
+ Enabled = false