diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 25 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index cc36ad1..d90d5dd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -13772,6 +13772,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13772 | AttachmentsPrimList.Add(new LSL_Integer(Attachment.PrimCount)); | 13772 | AttachmentsPrimList.Add(new LSL_Integer(Attachment.PrimCount)); |
13773 | ret.Add(new LSL_Integer(AttachmentsPrimList.Sum())); | 13773 | ret.Add(new LSL_Integer(AttachmentsPrimList.Sum())); |
13774 | break; | 13774 | break; |
13775 | case ScriptBaseClass.OBJECT_TOTAL_INVENTORY_COUNT: | ||
13776 | LSL_List AttachmentsPrimsInventoryList = new LSL_List(); | ||
13777 | foreach (SceneObjectGroup Attachment in av.GetAttachments()) | ||
13778 | { | ||
13779 | Attachment.ForEachPart(delegate(SceneObjectPart part) | ||
13780 | { | ||
13781 | AttachmentsPrimsInventoryList.Add(new LSL_Integer(part.Inventory.Count)); | ||
13782 | }); | ||
13783 | } | ||
13784 | ret.Add(new LSL_Integer(AttachmentsPrimsInventoryList.Sum())); | ||
13785 | break; | ||
13786 | case ScriptBaseClass.OBJECT_GROUP_TAG: | ||
13787 | ret.Add(new LSL_String(av.Grouptitle)); | ||
13788 | break; | ||
13775 | default: | 13789 | default: |
13776 | // Invalid or unhandled constant. | 13790 | // Invalid or unhandled constant. |
13777 | ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); | 13791 | ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); |
@@ -13953,6 +13967,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13953 | case ScriptBaseClass.OBJECT_PRIM_COUNT: | 13967 | case ScriptBaseClass.OBJECT_PRIM_COUNT: |
13954 | ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount)); | 13968 | ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount)); |
13955 | break; | 13969 | break; |
13970 | case ScriptBaseClass.OBJECT_TOTAL_INVENTORY_COUNT: | ||
13971 | LSL_List ObjectPrimsInventoryList = new LSL_List(); | ||
13972 | obj.ParentGroup.ForEachPart(delegate(SceneObjectPart part) | ||
13973 | { | ||
13974 | ObjectPrimsInventoryList.Add(new LSL_Integer(part.Inventory.Count)); | ||
13975 | }); | ||
13976 | ret.Add(ObjectPrimsInventoryList.Sum()); | ||
13977 | break; | ||
13978 | case ScriptBaseClass.OBJECT_GROUP_TAG: | ||
13979 | ret.Add(new LSL_String(String.Empty)); | ||
13980 | break; | ||
13956 | default: | 13981 | default: |
13957 | // Invalid or unhandled constant. | 13982 | // Invalid or unhandled constant. |
13958 | ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); | 13983 | ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index a177310..17173a2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -639,6 +639,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
639 | public const int OBJECT_CLICK_ACTION = 28; | 639 | public const int OBJECT_CLICK_ACTION = 28; |
640 | public const int OBJECT_OMEGA = 29; | 640 | public const int OBJECT_OMEGA = 29; |
641 | public const int OBJECT_PRIM_COUNT = 30; | 641 | public const int OBJECT_PRIM_COUNT = 30; |
642 | public const int OBJECT_TOTAL_INVENTORY_COUNT = 31; | ||
643 | public const int OBJECT_GROUP_TAG = 33; | ||
642 | 644 | ||
643 | // Pathfinding types | 645 | // Pathfinding types |
644 | public const int OPT_OTHER = -1; | 646 | public const int OPT_OTHER = -1; |