aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMandarinka Tasty2016-12-04 07:10:13 +0100
committerUbitUmarov2016-12-04 17:18:56 +0000
commit7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9 (patch)
treeb065a6dc4641b3d0ff1b805fdcb76bd4a2248518 /OpenSim/Region/ScriptEngine
parenta few changes to new GetDisplaynames and friends (diff)
downloadopensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.zip
opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.gz
opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.bz2
opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.xz
The new Constant: integer OBJECT_REZZER_KEY = 32;
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.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
2 files changed, 7 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 763106f..71e8ca9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -13793,6 +13793,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13793 } catch { }; 13793 } catch { };
13794 ret.Add(new LSL_Integer(invcount)); 13794 ret.Add(new LSL_Integer(invcount));
13795 break; 13795 break;
13796 case ScriptBaseClass.OBJECT_REZZER_KEY:
13797 ret.Add(new LSL_Key(id));
13798 break;
13796 case ScriptBaseClass.OBJECT_GROUP_TAG: 13799 case ScriptBaseClass.OBJECT_GROUP_TAG:
13797 ret.Add(new LSL_String(av.Grouptitle)); 13800 ret.Add(new LSL_String(av.Grouptitle));
13798 break; 13801 break;
@@ -13988,6 +13991,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13988 count += parts[i].Inventory.Count; 13991 count += parts[i].Inventory.Count;
13989 ret.Add(new LSL_Integer(count)); 13992 ret.Add(new LSL_Integer(count));
13990 break; 13993 break;
13994 case ScriptBaseClass.OBJECT_REZZER_KEY:
13995 ret.Add(new LSL_Key(obj.ParentGroup.RezzerID.ToString()));
13996 break;
13991 case ScriptBaseClass.OBJECT_GROUP_TAG: 13997 case ScriptBaseClass.OBJECT_GROUP_TAG:
13992 ret.Add(new LSL_String(String.Empty)); 13998 ret.Add(new LSL_String(String.Empty));
13993 break; 13999 break;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 48afcc0..734d878 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -640,6 +640,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
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; 642 public const int OBJECT_TOTAL_INVENTORY_COUNT = 31;
643 public const int OBJECT_REZZER_KEY = 32;
643 public const int OBJECT_GROUP_TAG = 33; 644 public const int OBJECT_GROUP_TAG = 33;
644 public const int OBJECT_TEMP_ATTACHED = 34; 645 public const int OBJECT_TEMP_ATTACHED = 34;
645 646