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

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2017-11-12 03:18:02 +00:00
parent 39d1426f27 8e8108c78c
commit ca4804b758
8 changed files with 391 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1081,7 +1081,7 @@ namespace OpenSim.Region.Framework.Scenes
{
int type = m_items[itemID].InvType;
m_items.LockItemsForRead(false);
if (type == 10) // Script
if (type == (int)InventoryType.LSL) // Script
{
m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
}
@@ -1101,7 +1101,7 @@ namespace OpenSim.Region.Framework.Scenes
m_items.LockItemsForRead(true);
foreach (TaskInventoryItem item in m_items.Values)
{
if (item.Type == 10)
if (item.Type == (int)InventoryType.LSL)
{
scriptcount++;
}