ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 9240 plus cosmetics, thx Tampa

Browse Source
This commit is contained in:
UbitUmarov
2026-04-06 00:26:37 +01:00
parent 1954be2f85
commit 144e0bf6bd
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/Serialization/ArchiveConstants.cs
View File

@@ -191,21 +191,16 @@ namespace OpenSim.Framework.Serialization
/// <returns></returns>
public static string ExtractPlainPathFromIarPath(string iarPath)
{
List<string> plainDirs = new();
string[] iarDirs = iarPath.Split('/', StringSplitOptions.RemoveEmptyEntries);
string[] iarDirs = iarPath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
foreach (string iarDir in iarDirs)
for(int i = 0 ; i < iarDirs.Length; i++)
{
if (!iarDir.Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR))
plainDirs.Add(iarDir);
int i = iarDir.LastIndexOf(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
plainDirs.Add(iarDir.Remove(i));
int sep = iarDirs[i].LastIndexOf(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
if (sep >= 0)
iarDirs[i] = iarDirs[i][..sep];
}
return string.Join("/", plainDirs.ToArray());
return string.Join('/', iarDirs);
}
}
}

9
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
View File

@@ -323,11 +323,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
{
// m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath);
if (resolvedFolders.ContainsKey(archivePath))
if (resolvedFolders.TryGetValue(archivePath, out InventoryFolderBase resolved))
{
// m_log.DebugFormat(
// "[INVENTORY ARCHIVER]: Found previously created folder from archive path {0}", archivePath);
return resolvedFolders[archivePath];
return resolved;
}
else
{
@@ -401,12 +401,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
{
// m_log.DebugFormat("[INVENTORY ARCHIVER]: Creating folder {0} from IAR", rawDirsToCreate[i]);
if (!rawDirsToCreate[i].Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR))
continue;
int identicalNameIdentifierIndex
= rawDirsToCreate[i].LastIndexOf(
ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
if(identicalNameIdentifierIndex < 0)
continue;
string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);