zontreck/OpenSim-Sasquatch
1
0
Fork 0
mirror of https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tag 'opensim-rel-0.9.3.8984' into develop
Some checks failed
CodeQL / Analyze (csharp) (push) Has been cancelled
Details
dotnet package / build (8.0.x) (push) Has been cancelled
Details
dotnet package / build (9.0.x) (push) Has been cancelled
Details

Browse source 
Finalize 0.9.3.8984
This commit is contained in:
Mike Dickson 2024-08-10 11:24:42 -04:00
commit 90d3148f5f
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OpenSim/Framework/VersionInfo.cs
View file

@ -37,8 +37,8 @@ namespace OpenSim
{
public class VersionInfo
{
public const string VersionNumber = "0.9.3.0";
public const string AssemblyVersionNumber = "0.9.3.0";
public const string VersionNumber = "0.9.3";
public const string AssemblyVersionNumber = "0.9.3";
public const string Release = "8984";
public static string Version

4
OpenSim/Framework/VersionInfo.tt
View file

@ -37,8 +37,8 @@ namespace OpenSim
{
public class VersionInfo
{
public const string VersionNumber = "0.9.3.0";
public const string AssemblyVersionNumber = "0.9.3.0";
public const string VersionNumber = "0.9.3";
public const string AssemblyVersionNumber = "0.9.3";
public const string Release = "<#= (int)DateTimeOffset.UtcNow.Subtract(new DateTimeOffset(2000, 1, 1, 0, 0, 0, TimeSpan.Zero)).TotalDays #>";
public static string Version

4
OpenSim/Region/Framework/Scenes/LinksetData.cs
View file

@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes
{
try
{
m_log.Debug($"Exception deserializing LinkSetData, trying original format: {data}", jse);
m_log.Debug($"Exception deserializing LinkSetData, trying original format: {jse.Message}");
var listData = JsonSerializer.Deserialize<SortedList<string, LinksetDataEntry>>(data);
lsd = new LinksetData { Data = listData };
}
@ -151,7 +151,7 @@ namespace OpenSim.Region.Framework.Scenes
// Add New or Update handled here.
var newEntry = new LinksetDataEntry(value, pass);
Data.Add(key, newEntry);
Data[key] = newEntry;
int cost = newEntry.GetCost(key);
LinksetDataAccountingDelta(cost);