Compare commits

...

3 Commits

Author SHA1 Message Date
UbitUmarov
9db019b2cc still read upload level from teh old position in Startup config, just in case 2026-05-11 17:46:57 +01:00
Ubit Umarov
f1b74cde60 Merge pull request #34 from holoneon/patch-1
Update AssetTransactionModule.cs
2026-05-11 17:15:41 +01:00
Fiona Sweet
d6fd012e65 Update AssetTransactionModule.cs
LevelUpload is defined in [Permissions] in OpenSimDefaults.ini, not [Startup]
2026-05-11 07:14:56 -07:00
2 changed files with 19 additions and 7 deletions

View File

@@ -102,14 +102,16 @@ namespace OpenSim.Region.ClientStack.Linden
{
IConfig sconfig = config.Configs["Startup"];
if (sconfig is not null)
ConfigOptions.levelUpload = sconfig.GetInt("LevelUpload", 0);
ConfigOptions.levelUpload = sconfig.GetInt("LevelUpload", -9798);
if (ConfigOptions.levelUpload == 0)
if (ConfigOptions.levelUpload == -9798)
{
IConfig pconfig = config.Configs["Permissions"];
if (pconfig is not null)
ConfigOptions.levelUpload = pconfig.GetInt("LevelUpload", 0);
}
if (ConfigOptions.levelUpload == -9798)
ConfigOptions.levelUpload = 0;
IConfig appearanceConfig = config.Configs["Appearance"];
if (appearanceConfig is not null)

View File

@@ -51,18 +51,28 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
/// <summary>
/// Each agent has its own singleton collection of transactions
/// </summary>
private Dictionary<UUID, AgentAssetTransactions> AgentTransactions =
new Dictionary<UUID, AgentAssetTransactions>();
private Dictionary<UUID, AgentAssetTransactions> AgentTransactions = [];
#region Region Module interface
public void Initialise(IConfigSource source)
{
IConfig sconfig = source.Configs["Startup"];
if(source != null)
{
IConfig sconfig = source.Configs["Permissions"];
if (sconfig != null)
{
m_levelUpload = sconfig.GetInt("LevelUpload", -9798);
}
if(m_levelUpload == -9798)
{
sconfig = source.Configs["Startup"];
if (sconfig is not null)
m_levelUpload = sconfig.GetInt("LevelUpload", 0);
}
if(m_levelUpload == -9798)
m_levelUpload = 0;
}
}
public void AddRegion(Scene scene)