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

a few , mostly cosmetic, changes to osSetTerrainTextures and add prim inventory osSetTerrainTextures with a list of possible asset types to match

Browse Source
This commit is contained in:
UbitUmarov
2025-05-06 23:40:40 +01:00
parent 23ad195e7a
commit ef2fce034f
3 changed files with 67 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
View File

@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Collections;
using OpenMetaverse;
@@ -216,8 +217,10 @@ namespace OpenSim.Region.Framework.Interfaces
/// <returns>
/// The inventory item. Null if no such item was found.
/// </returns>
TaskInventoryItem GetInventoryItem(string name);
TaskInventoryItem GetInventoryItem(string name, int assetType);
TaskInventoryItem GetInventoryItem(ReadOnlySpan<char> name);
TaskInventoryItem GetInventoryItem(ReadOnlySpan<char> name, int assetType);
TaskInventoryItem GetInventoryItem(ReadOnlySpan<char> name, ReadOnlySpan<int> assetTypes);
/// <summary>
/// Get inventory items by name.
@@ -227,7 +230,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// A list of inventory items with that name.
/// If no inventory item has that name then an empty list is returned.
/// </returns>
List<TaskInventoryItem> GetInventoryItems(string name);
List<TaskInventoryItem> GetInventoryItems(ReadOnlySpan<char> name);
/// <summary>
/// Get inventory items by type.

40
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@@ -1075,12 +1075,12 @@ namespace OpenSim.Region.Framework.Scenes
return item;
}
public TaskInventoryItem GetInventoryItem(string name)
public TaskInventoryItem GetInventoryItem(ReadOnlySpan<char> name)
{
m_items.LockItemsForRead(true);
foreach (TaskInventoryItem item in m_items.Values)
{
if (item.Name == name)
if (name.Equals(item.Name, StringComparison.Ordinal))
{
m_items.LockItemsForRead(false);
return item;
@@ -1091,12 +1091,12 @@ namespace OpenSim.Region.Framework.Scenes
return null;
}
public TaskInventoryItem GetInventoryItem(string name, int type)
public TaskInventoryItem GetInventoryItem(ReadOnlySpan<char> name, int type)
{
m_items.LockItemsForRead(true);
foreach (TaskInventoryItem item in m_items.Values)
{
if (item.Type == type && item.Name == name)
if (item.Type == type && name.Equals(item.Name, StringComparison.Ordinal))
{
m_items.LockItemsForRead(false);
return item;
@@ -1107,15 +1107,41 @@ namespace OpenSim.Region.Framework.Scenes
return null;
}
public List<TaskInventoryItem> GetInventoryItems(string name)
public TaskInventoryItem GetInventoryItem(ReadOnlySpan<char> name, ReadOnlySpan<int> types)
{
List<TaskInventoryItem> items = new List<TaskInventoryItem>();
if(types.Length == 0)
return null;
m_items.LockItemsForRead(true);
foreach (TaskInventoryItem item in m_items.Values)
{
if (name.Equals(item.Name, StringComparison.Ordinal))
{
int type = item.Type;
int i = 0;
do
{
if(type == types[i])
{
m_items.LockItemsForRead(false);
return item;
}
i++;
}while(i < types.Length);
}
}
m_items.LockItemsForRead(false);
return null;
}
public List<TaskInventoryItem> GetInventoryItems(ReadOnlySpan<char> name)
{
List<TaskInventoryItem> items = [];
m_items.LockItemsForRead(true);
foreach (TaskInventoryItem item in m_items.Values)
{
if (item.Name == name)
if (name.Equals(item.Name, StringComparison.Ordinal))
items.Add(item);
}