aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMandarinka Tasty2016-11-29 03:52:01 +0100
committerUbitUmarov2016-11-30 00:06:25 +0000
commit7de2c8ae708757f7dc929130d1d097e5589ce36a (patch)
treed391c36e69a2c18d992d6c2c274818c59275ffdf /OpenSim/Region/ScriptEngine
parentchange last patch a bit (diff)
downloadopensim-SC_OLD-7de2c8ae708757f7dc929130d1d097e5589ce36a.zip
opensim-SC_OLD-7de2c8ae708757f7dc929130d1d097e5589ce36a.tar.gz
opensim-SC_OLD-7de2c8ae708757f7dc929130d1d097e5589ce36a.tar.bz2
opensim-SC_OLD-7de2c8ae708757f7dc929130d1d097e5589ce36a.tar.xz
The new Constant: integer OBJECT_TEMP_ATTACHED = 34;
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
2 files changed, 14 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 80bb461..9c8d40a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -13792,6 +13792,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13792 case ScriptBaseClass.OBJECT_GROUP_TAG: 13792 case ScriptBaseClass.OBJECT_GROUP_TAG:
13793 ret.Add(new LSL_String(av.Grouptitle)); 13793 ret.Add(new LSL_String(av.Grouptitle));
13794 break; 13794 break;
13795 case ScriptBaseClass.OBJECT_TEMP_ATTACHED:
13796 ret.Add(new LSL_Integer(0));
13797 break;
13795 default: 13798 default:
13796 // Invalid or unhandled constant. 13799 // Invalid or unhandled constant.
13797 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); 13800 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL));
@@ -13984,6 +13987,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13984 case ScriptBaseClass.OBJECT_GROUP_TAG: 13987 case ScriptBaseClass.OBJECT_GROUP_TAG:
13985 ret.Add(new LSL_String(String.Empty)); 13988 ret.Add(new LSL_String(String.Empty));
13986 break; 13989 break;
13990 case ScriptBaseClass.OBJECT_TEMP_ATTACHED:
13991 if (obj.ParentGroup.AttachmentPoint != 0 && obj.ParentGroup.FromItemID == UUID.Zero)
13992 {
13993 ret.Add(new LSL_Integer(1));
13994 }
13995 else
13996 {
13997 ret.Add(new LSL_Integer(0));
13998 }
13999 break;
13987 default: 14000 default:
13988 // Invalid or unhandled constant. 14001 // Invalid or unhandled constant.
13989 ret.Add(new LSL_Integer(ScriptBaseClass.OBJECT_UNKNOWN_DETAIL)); 14002 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 17173a2..48afcc0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -641,6 +641,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
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; 642 public const int OBJECT_TOTAL_INVENTORY_COUNT = 31;
643 public const int OBJECT_GROUP_TAG = 33; 643 public const int OBJECT_GROUP_TAG = 33;
644 public const int OBJECT_TEMP_ATTACHED = 34;
644 645
645 // Pathfinding types 646 // Pathfinding types
646 public const int OPT_OTHER = -1; 647 public const int OPT_OTHER = -1;