diff options
author | Mandarinka Tasty | 2016-11-27 22:50:11 +0100 |
---|---|---|
committer | UbitUmarov | 2016-11-28 05:20:32 +0000 |
commit | af3f2717fd1b92a0f5f6003a8ce03939b8c57b47 (patch) | |
tree | 474899966d0b5697f12c03a923b107db7aa5ef10 /OpenSim/Region | |
parent | increase HG mapsearch spargetti; add more flexibility on input uri formats. T... (diff) | |
download | opensim-SC_OLD-af3f2717fd1b92a0f5f6003a8ce03939b8c57b47.zip opensim-SC_OLD-af3f2717fd1b92a0f5f6003a8ce03939b8c57b47.tar.gz opensim-SC_OLD-af3f2717fd1b92a0f5f6003a8ce03939b8c57b47.tar.bz2 opensim-SC_OLD-af3f2717fd1b92a0f5f6003a8ce03939b8c57b47.tar.xz |
The implementation of new flags = paramters for llGetObjectDetails - Part I Constant: integer OBJECT_CLICK_ACTION = 28; Constant: integer OBJECT_OMEGA = 29; Constant: integer OBJECT_PRIM_COUNT = 30;
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 23 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 3 |
2 files changed, 26 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 849d02d..cc36ad1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -13758,6 +13758,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13758 | case ScriptBaseClass.OBJECT_LAST_OWNER_ID: | 13758 | case ScriptBaseClass.OBJECT_LAST_OWNER_ID: |
13759 | ret.Add(new LSL_Key(ScriptBaseClass.NULL_KEY)); | 13759 | ret.Add(new LSL_Key(ScriptBaseClass.NULL_KEY)); |
13760 | break; | 13760 | break; |
13761 | case ScriptBaseClass.OBJECT_CLICK_ACTION: | ||
13762 | ret.Add(new LSL_Integer(0)); | ||
13763 | break; | ||
13764 | case ScriptBaseClass.OBJECT_OMEGA: | ||
13765 | ret.Add(new LSL_Vector(Vector3.Zero)); | ||
13766 | break; | ||
13767 | case ScriptBaseClass.OBJECT_PRIM_COUNT: | ||
13768 | LSL_List AttachmentsPrimList = new LSL_List(); | ||
13769 | List<SceneObjectGroup> Attachments; | ||
13770 | Attachments = av.GetAttachments(); | ||
13771 | foreach (SceneObjectGroup Attachment in Attachments) | ||
13772 | AttachmentsPrimList.Add(new LSL_Integer(Attachment.PrimCount)); | ||
13773 | ret.Add(new LSL_Integer(AttachmentsPrimList.Sum())); | ||
13774 | break; | ||
13761 | default: | 13775 | default: |
13762 | // Invalid or unhandled constant. | 13776 | // Invalid or unhandled constant. |
13763 | ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); | 13777 | ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); |
@@ -13930,6 +13944,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13930 | case ScriptBaseClass.OBJECT_LAST_OWNER_ID: | 13944 | case ScriptBaseClass.OBJECT_LAST_OWNER_ID: |
13931 | ret.Add(new LSL_Key(obj.ParentGroup.LastOwnerID.ToString())); | 13945 | ret.Add(new LSL_Key(obj.ParentGroup.LastOwnerID.ToString())); |
13932 | break; | 13946 | break; |
13947 | case ScriptBaseClass.OBJECT_CLICK_ACTION: | ||
13948 | ret.Add(new LSL_Integer(obj.ClickAction)); | ||
13949 | break; | ||
13950 | case ScriptBaseClass.OBJECT_OMEGA: | ||
13951 | ret.Add(new LSL_Vector(obj.AngularVelocity)); | ||
13952 | break; | ||
13953 | case ScriptBaseClass.OBJECT_PRIM_COUNT: | ||
13954 | ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount)); | ||
13955 | break; | ||
13933 | default: | 13956 | default: |
13934 | // Invalid or unhandled constant. | 13957 | // Invalid or unhandled constant. |
13935 | ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); | 13958 | 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 cee66b2..a177310 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -636,6 +636,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
636 | public const int OBJECT_HOVER_HEIGHT = 25; | 636 | public const int OBJECT_HOVER_HEIGHT = 25; |
637 | public const int OBJECT_BODY_SHAPE_TYPE = 26; | 637 | public const int OBJECT_BODY_SHAPE_TYPE = 26; |
638 | public const int OBJECT_LAST_OWNER_ID = 27; | 638 | public const int OBJECT_LAST_OWNER_ID = 27; |
639 | public const int OBJECT_CLICK_ACTION = 28; | ||
640 | public const int OBJECT_OMEGA = 29; | ||
641 | public const int OBJECT_PRIM_COUNT = 30; | ||
639 | 642 | ||
640 | // Pathfinding types | 643 | // Pathfinding types |
641 | public const int OPT_OTHER = -1; | 644 | public const int OPT_OTHER = -1; |