lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert folder version to ushort as in upstream

Browse Source 
A signed int was a bad idea because of rollover
into the negative -sizeof(int)

To illustrate, my 'Current Outfits' folder version
is now, about 1 year after born, version 33000
This commit is contained in:
lickx
2024-11-29 14:25:24 +01:00
parent 7a6b3b3bf2
commit 1cd2361936
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/MySQL/MySQLInventoryData.cs
View File

@@ -386,7 +386,7 @@ namespace OpenSim.Data.MySQL
folder.ID = DBGuid.FromDB(reader["folderID"]);
folder.Name = (string) reader["folderName"];
folder.Type = (short) reader["type"];
folder.Version = (int) reader["version"];
folder.Version = (ushort) ((int) reader["version"]);
return folder;
}
catch (Exception e)

2
OpenSim/Data/MySQL/MySQLUserProfilesData.cs
View File

@@ -1023,4 +1023,4 @@ namespace OpenSim.Data.MySQL
}
#endregion Integration
}
}
}

2
OpenSim/Data/PGSQL/PGSQLInventoryData.cs
View File

@@ -750,7 +750,7 @@ namespace OpenSim.Data.PGSQL
folder.ID = DBGuid.FromDB(reader["folderID"]);
folder.Name = (string)reader["folderName"];
folder.Type = (short)reader["type"];
folder.Version = (int)reader["version"];
folder.Version = Convert.ToUInt16(reader["version"]);
return folder;
}

6
OpenSim/Framework/InventoryFolderBase.cs
View File

@@ -50,7 +50,7 @@ namespace OpenSim.Framework
/// <summary>
/// This is used to denote the version of folder
/// </summary>
private int _version;
private ushort _version;
public virtual UUID ParentID
{
@@ -64,7 +64,7 @@ namespace OpenSim.Framework
set { _type = value; }
}
public virtual int Version
public virtual ushort Version
{
get { return _version; }
set { _version = value; }
@@ -91,7 +91,7 @@ namespace OpenSim.Framework
}
public InventoryFolderBase(
UUID id, string name, UUID owner, short type, UUID parent, int version) : this(id, name, owner, parent)
UUID id, string name, UUID owner, short type, UUID parent, ushort version) : this(id, name, owner, parent)
{
Type = type;
Version = version;

2
OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
View File

@@ -735,7 +735,7 @@ namespace OpenSim.Server.Handlers.Inventory
folder.ParentID = new UUID(data["ParentID"].ToString());
folder.Type = short.Parse(data["Type"].ToString());
folder.Version = int.Parse(data["Version"].ToString());
folder.Version = ushort.Parse(data["Version"].ToString());
folder.Name = data["Name"].ToString();
folder.Owner = new UUID(data["Owner"].ToString());
folder.ID = new UUID(data["ID"].ToString());

2
OpenSim/Services/InventoryService/LibraryService.cs
View File

@@ -152,7 +152,7 @@ namespace OpenSim.Services.InventoryService
string basePath = Path.GetDirectoryName(path);
if (config.Contains("RootVersion"))
{
m_LibraryRootFolder.Version = config.GetInt("RootVersion", m_LibraryRootFolder.Version);
m_LibraryRootFolder.Version = (ushort)config.GetInt("RootVersion", m_LibraryRootFolder.Version);
return;
}

6
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@@ -427,7 +427,7 @@ namespace OpenSim.Services.InventoryService
return false;
}
check.Version = xFolder.version;
check.Version = (ushort)xFolder.version;
xFolder = ConvertFromOpenSim(check);
// m_log.DebugFormat(
@@ -675,7 +675,7 @@ namespace OpenSim.Services.InventoryService
{
ParentID = folder.parentFolderID,
Type = (short)folder.type,
Version = folder.version,
Version = (ushort)folder.version,
Name = folder.folderName,
Owner = folder.agentID,
ID = folder.folderID
@@ -688,7 +688,7 @@ namespace OpenSim.Services.InventoryService
{
parentFolderID = folder.ParentID,
type = (int)folder.Type,
version = folder.Version,
version = (int)folder.Version,
folderName = folder.Name,
agentID = folder.Owner,
folderID = folder.ID