diff options
author | Justin Clarke Casey | 2009-03-11 18:02:22 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-11 18:02:22 +0000 |
commit | acad0328b2c50d22fe76ebb7c8de2c97c856b42f (patch) | |
tree | 2379c1ae60c22a4dcee162c5b56d21f367c05bfd /OpenSim/Region/CoreModules | |
parent | * Fix silly windows prebuild borkage. To use System.Xml, the project must ha... (diff) | |
download | opensim-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)
Diffstat (limited to '')
5 files changed, 6 insertions, 6 deletions
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 | { |