aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs71
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs79
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs113
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs173
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp48
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs2
9 files changed, 420 insertions, 97 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
new file mode 100644
index 0000000..4132dfa
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
@@ -0,0 +1,71 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Runtime.Remoting.Lifetime;
30using System.Threading;
31using System.Reflection;
32using System.Collections;
33using System.Collections.Generic;
34using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
38using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
39using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
40using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
41using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
42using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
43using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
44using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
45using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
46
47namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
48{
49 public partial class ScriptBaseClass : MarshalByRefObject
50 {
51 public ICM_Api m_CM_Functions;
52
53 public void ApiTypeCM(IScriptApi api)
54 {
55 if (!(api is ICM_Api))
56 return;
57
58 m_CM_Functions = (ICM_Api)api;
59 }
60
61 public string cmDetectedCountry(int num)
62 {
63 return m_CM_Functions.cmDetectedCountry(num);
64 }
65
66 public string cmGetAgentCountry(key key)
67 {
68 return m_CM_Functions.cmGetAgentCountry(key);
69 }
70 }
71}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index ce17ed0..1cc2cfb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Reflection; 31using System.Reflection;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using OpenSim.Region.ScriptEngine.Shared; 33using OpenSim.Region.ScriptEngine.Shared;
@@ -133,6 +134,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
133 return (eventFlags); 134 return (eventFlags);
134 } 135 }
135 136
137 [DebuggerNonUserCode]
136 public void ExecuteEvent(string state, string FunctionName, object[] args) 138 public void ExecuteEvent(string state, string FunctionName, object[] args)
137 { 139 {
138 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory. 140 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 9aecea2..2f249a7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -29,6 +29,7 @@ using System;
29using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; 29using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
30using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; 30using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
31using LSLInteger = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; 31using LSLInteger = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
32using LSLString = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
32 33
33namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase 34namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
34{ 35{
@@ -57,7 +58,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
57 public const int ACTIVE = 2; 58 public const int ACTIVE = 2;
58 public const int PASSIVE = 4; 59 public const int PASSIVE = 4;
59 public const int SCRIPTED = 8; 60 public const int SCRIPTED = 8;
60 public const int OS_NPC = 0x01000000;
61 61
62 public const int CONTROL_FWD = 1; 62 public const int CONTROL_FWD = 1;
63 public const int CONTROL_BACK = 2; 63 public const int CONTROL_BACK = 2;
@@ -82,6 +82,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
82 public const int PERMISSION_CHANGE_PERMISSIONS = 512; 82 public const int PERMISSION_CHANGE_PERMISSIONS = 512;
83 public const int PERMISSION_TRACK_CAMERA = 1024; 83 public const int PERMISSION_TRACK_CAMERA = 1024;
84 public const int PERMISSION_CONTROL_CAMERA = 2048; 84 public const int PERMISSION_CONTROL_CAMERA = 2048;
85 public const int PERMISSION_TELEPORT = 4096;
86 public const int PERMISSION_OVERRIDE_ANIMATIONS = 0x8000;
85 87
86 public const int AGENT_FLYING = 1; 88 public const int AGENT_FLYING = 1;
87 public const int AGENT_ATTACHMENTS = 2; 89 public const int AGENT_ATTACHMENTS = 2;
@@ -96,6 +98,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
96 public const int AGENT_CROUCHING = 1024; 98 public const int AGENT_CROUCHING = 1024;
97 public const int AGENT_BUSY = 2048; 99 public const int AGENT_BUSY = 2048;
98 public const int AGENT_ALWAYS_RUN = 4096; 100 public const int AGENT_ALWAYS_RUN = 4096;
101 public const int AGENT_MALE = 8192;
99 102
100 //Particle Systems 103 //Particle Systems
101 public const int PSYS_PART_INTERP_COLOR_MASK = 1; 104 public const int PSYS_PART_INTERP_COLOR_MASK = 1;
@@ -252,6 +255,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
252 public const int ATTACH_HUD_BOTTOM_RIGHT = 38; 255 public const int ATTACH_HUD_BOTTOM_RIGHT = 38;
253 public const int ATTACH_NECK = 39; 256 public const int ATTACH_NECK = 39;
254 public const int ATTACH_AVATAR_CENTER = 40; 257 public const int ATTACH_AVATAR_CENTER = 40;
258 public const int ATTACH_LHAND_RING1 = 41;
259 public const int ATTACH_RHAND_RING1 = 42;
260 public const int ATTACH_TAIL_BASE = 43;
261 public const int ATTACH_TAIL_TIP = 44;
262 public const int ATTACH_LWING = 45;
263 public const int ATTACH_RWING = 46;
264 public const int ATTACH_FACE_JAW = 47;
265 public const int ATTACH_FACE_LEAR = 48;
266 public const int ATTACH_FACE_REAR = 49;
267 public const int ATTACH_FACE_LEYE = 50;
268 public const int ATTACH_FACE_REYE = 51;
269 public const int ATTACH_FACE_TONGUE = 52;
270 public const int ATTACH_GROIN = 53;
271 public const int ATTACH_HIND_LFOOT = 54;
272 public const int ATTACH_HIND_RFOOT = 55;
255 273
256 #region osMessageAttachments constants 274 #region osMessageAttachments constants
257 275
@@ -334,11 +352,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
334 public const int ROTATE = 32; 352 public const int ROTATE = 32;
335 public const int SCALE = 64; 353 public const int SCALE = 64;
336 public const int ALL_SIDES = -1; 354 public const int ALL_SIDES = -1;
355
356 // LINK flags
337 public const int LINK_SET = -1; 357 public const int LINK_SET = -1;
338 public const int LINK_ROOT = 1; 358 public const int LINK_ROOT = 1;
339 public const int LINK_ALL_OTHERS = -2; 359 public const int LINK_ALL_OTHERS = -2;
340 public const int LINK_ALL_CHILDREN = -3; 360 public const int LINK_ALL_CHILDREN = -3;
341 public const int LINK_THIS = -4; 361 public const int LINK_THIS = -4;
362
342 public const int CHANGED_INVENTORY = 1; 363 public const int CHANGED_INVENTORY = 1;
343 public const int CHANGED_COLOR = 2; 364 public const int CHANGED_COLOR = 2;
344 public const int CHANGED_SHAPE = 4; 365 public const int CHANGED_SHAPE = 4;
@@ -353,6 +374,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
353 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART 374 public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
354 public const int CHANGED_MEDIA = 2048; 375 public const int CHANGED_MEDIA = 2048;
355 public const int CHANGED_ANIMATION = 16384; 376 public const int CHANGED_ANIMATION = 16384;
377 public const int CHANGED_POSITION = 32768;
378
356 public const int TYPE_INVALID = 0; 379 public const int TYPE_INVALID = 0;
357 public const int TYPE_INTEGER = 1; 380 public const int TYPE_INTEGER = 1;
358 public const int TYPE_FLOAT = 2; 381 public const int TYPE_FLOAT = 2;
@@ -386,6 +409,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
386 public const int CONTENT_TYPE_FORM = 7; //application/x-www-form-urlencoded 409 public const int CONTENT_TYPE_FORM = 7; //application/x-www-form-urlencoded
387 public const int CONTENT_TYPE_RSS = 8; //application/rss+xml 410 public const int CONTENT_TYPE_RSS = 8; //application/rss+xml
388 411
412 //parameters comand flags
389 public const int PRIM_MATERIAL = 2; 413 public const int PRIM_MATERIAL = 2;
390 public const int PRIM_PHYSICS = 3; 414 public const int PRIM_PHYSICS = 3;
391 public const int PRIM_TEMP_ON_REZ = 4; 415 public const int PRIM_TEMP_ON_REZ = 4;
@@ -394,19 +418,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
394 public const int PRIM_SIZE = 7; 418 public const int PRIM_SIZE = 7;
395 public const int PRIM_ROTATION = 8; 419 public const int PRIM_ROTATION = 8;
396 public const int PRIM_TYPE = 9; 420 public const int PRIM_TYPE = 9;
421 // gap 10-16
397 public const int PRIM_TEXTURE = 17; 422 public const int PRIM_TEXTURE = 17;
398 public const int PRIM_COLOR = 18; 423 public const int PRIM_COLOR = 18;
399 public const int PRIM_BUMP_SHINY = 19; 424 public const int PRIM_BUMP_SHINY = 19;
400 public const int PRIM_FULLBRIGHT = 20; 425 public const int PRIM_FULLBRIGHT = 20;
401 public const int PRIM_FLEXIBLE = 21; 426 public const int PRIM_FLEXIBLE = 21;
402 public const int PRIM_TEXGEN = 22; 427 public const int PRIM_TEXGEN = 22;
403 public const int PRIM_CAST_SHADOWS = 24; // Not implemented, here for completeness sake
404 public const int PRIM_POINT_LIGHT = 23; // Huh? 428 public const int PRIM_POINT_LIGHT = 23; // Huh?
429 public const int PRIM_CAST_SHADOWS = 24; // Not implemented, here for completeness sake
405 public const int PRIM_GLOW = 25; 430 public const int PRIM_GLOW = 25;
406 public const int PRIM_TEXT = 26; 431 public const int PRIM_TEXT = 26;
407 public const int PRIM_NAME = 27; 432 public const int PRIM_NAME = 27;
408 public const int PRIM_DESC = 28; 433 public const int PRIM_DESC = 28;
409 public const int PRIM_ROT_LOCAL = 29; 434 public const int PRIM_ROT_LOCAL = 29;
435 public const int PRIM_PHYSICS_SHAPE_TYPE = 30;
436 public const int PRIM_PHYSICS_MATERIAL = 31; // apparently not on SL wiki
410 public const int PRIM_OMEGA = 32; 437 public const int PRIM_OMEGA = 32;
411 public const int PRIM_POS_LOCAL = 33; 438 public const int PRIM_POS_LOCAL = 33;
412 public const int PRIM_LINK_TARGET = 34; 439 public const int PRIM_LINK_TARGET = 34;
@@ -414,6 +441,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
414 public const int PRIM_SPECULAR = 36; 441 public const int PRIM_SPECULAR = 36;
415 public const int PRIM_NORMAL = 37; 442 public const int PRIM_NORMAL = 37;
416 public const int PRIM_ALPHA_MODE = 38; 443 public const int PRIM_ALPHA_MODE = 38;
444 public const int PRIM_ALLOW_UNSIT = 39; // experiences related. unsupported
445 public const int PRIM_SCRIPTED_SIT_ONLY = 40; // experiences related. unsupported
446 public const int PRIM_SIT_TARGET = 41;
447
448
449 // parameters
417 public const int PRIM_TEXGEN_DEFAULT = 0; 450 public const int PRIM_TEXGEN_DEFAULT = 0;
418 public const int PRIM_TEXGEN_PLANAR = 1; 451 public const int PRIM_TEXGEN_PLANAR = 1;
419 452
@@ -470,6 +503,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
470 public const int PRIM_SCULPT_FLAG_INVERT = 64; 503 public const int PRIM_SCULPT_FLAG_INVERT = 64;
471 public const int PRIM_SCULPT_FLAG_MIRROR = 128; 504 public const int PRIM_SCULPT_FLAG_MIRROR = 128;
472 505
506 public const int PRIM_PHYSICS_SHAPE_PRIM = 0;
507 public const int PRIM_PHYSICS_SHAPE_NONE = 1;
508 public const int PRIM_PHYSICS_SHAPE_CONVEX = 2;
509
473 public const int PROFILE_NONE = 0; 510 public const int PROFILE_NONE = 0;
474 public const int PROFILE_SCRIPT_MEMORY = 1; 511 public const int PROFILE_SCRIPT_MEMORY = 1;
475 512
@@ -600,6 +637,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
600 public const int OBJECT_HOVER_HEIGHT = 25; 637 public const int OBJECT_HOVER_HEIGHT = 25;
601 public const int OBJECT_BODY_SHAPE_TYPE = 26; 638 public const int OBJECT_BODY_SHAPE_TYPE = 26;
602 public const int OBJECT_LAST_OWNER_ID = 27; 639 public const int OBJECT_LAST_OWNER_ID = 27;
640 public const int OBJECT_CLICK_ACTION = 28;
641 public const int OBJECT_OMEGA = 29;
642 public const int OBJECT_PRIM_COUNT = 30;
643 public const int OBJECT_TOTAL_INVENTORY_COUNT = 31;
644 public const int OBJECT_REZZER_KEY = 32;
645 public const int OBJECT_GROUP_TAG = 33;
646 public const int OBJECT_TEMP_ATTACHED = 34;
647 public const int OBJECT_ATTACHED_SLOTS_AVAILABLE = 35;
603 648
604 // Pathfinding types 649 // Pathfinding types
605 public const int OPT_OTHER = -1; 650 public const int OPT_OTHER = -1;
@@ -615,6 +660,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
615 public const int AGENT_LIST_PARCEL = 1; 660 public const int AGENT_LIST_PARCEL = 1;
616 public const int AGENT_LIST_PARCEL_OWNER = 2; 661 public const int AGENT_LIST_PARCEL_OWNER = 2;
617 public const int AGENT_LIST_REGION = 4; 662 public const int AGENT_LIST_REGION = 4;
663 public const int AGENT_LIST_EXCLUDENPC = 0x4000000; // our flag, not SL and it is a bit mask
618 664
619 // Can not be public const? 665 // Can not be public const?
620 public static readonly vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0); 666 public static readonly vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0);
@@ -652,7 +698,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
652 public const int PARCEL_DETAILS_GROUP = 3; 698 public const int PARCEL_DETAILS_GROUP = 3;
653 public const int PARCEL_DETAILS_AREA = 4; 699 public const int PARCEL_DETAILS_AREA = 4;
654 public const int PARCEL_DETAILS_ID = 5; 700 public const int PARCEL_DETAILS_ID = 5;
655 public const int PARCEL_DETAILS_SEE_AVATARS = 6; // not implemented 701 public const int PARCEL_DETAILS_SEE_AVATARS = 6;
702 public const int PARCEL_DETAILS_ANY_AVATAR_SOUNDS = 7;
703 public const int PARCEL_DETAILS_GROUP_SOUNDS = 8;
656 704
657 //osSetParcelDetails 705 //osSetParcelDetails
658 public const int PARCEL_DETAILS_CLAIMDATE = 10; 706 public const int PARCEL_DETAILS_CLAIMDATE = 10;
@@ -698,12 +746,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
698 public const int PRIM_MEDIA_PERM_GROUP = 2; 746 public const int PRIM_MEDIA_PERM_GROUP = 2;
699 public const int PRIM_MEDIA_PERM_ANYONE = 4; 747 public const int PRIM_MEDIA_PERM_ANYONE = 4;
700 748
701 public const int PRIM_PHYSICS_SHAPE_TYPE = 30;
702 public const int PRIM_PHYSICS_SHAPE_PRIM = 0;
703 public const int PRIM_PHYSICS_SHAPE_CONVEX = 2;
704 public const int PRIM_PHYSICS_SHAPE_NONE = 1;
705
706 public const int PRIM_PHYSICS_MATERIAL = 31;
707 public const int DENSITY = 1; 749 public const int DENSITY = 1;
708 public const int FRICTION = 2; 750 public const int FRICTION = 2;
709 public const int RESTITUTION = 4; 751 public const int RESTITUTION = 4;
@@ -760,6 +802,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
760 public const int OS_NPC_CREATOR_OWNED = 0x1; 802 public const int OS_NPC_CREATOR_OWNED = 0x1;
761 public const int OS_NPC_NOT_OWNED = 0x2; 803 public const int OS_NPC_NOT_OWNED = 0x2;
762 public const int OS_NPC_SENSE_AS_AGENT = 0x4; 804 public const int OS_NPC_SENSE_AS_AGENT = 0x4;
805 public const int OS_NPC_OBJECT_GROUP = 0x08;
763 806
764 public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED"; 807 public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
765 public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED"; 808 public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
@@ -795,6 +838,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
795 public const int KFM_CMD_STOP = 1; 838 public const int KFM_CMD_STOP = 1;
796 public const int KFM_CMD_PAUSE = 2; 839 public const int KFM_CMD_PAUSE = 2;
797 840
841 public const string JSON_INVALID = "\uFDD0";
842 public const string JSON_OBJECT = "\uFDD1";
843 public const string JSON_ARRAY = "\uFDD2";
844 public const string JSON_NUMBER = "\uFDD3";
845 public const string JSON_STRING = "\uFDD4";
846 public const string JSON_NULL = "\uFDD5";
847 public const string JSON_TRUE = "\uFDD6";
848 public const string JSON_FALSE = "\uFDD7";
849 public const string JSON_DELETE = "\uFDD8";
850 public const string JSON_APPEND = "-1";
851
798 /// <summary> 852 /// <summary>
799 /// process name parameter as regex 853 /// process name parameter as regex
800 /// </summary> 854 /// </summary>
@@ -804,5 +858,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
804 /// process message parameter as regex 858 /// process message parameter as regex
805 /// </summary> 859 /// </summary>
806 public const int OS_LISTEN_REGEX_MESSAGE = 0x2; 860 public const int OS_LISTEN_REGEX_MESSAGE = 0x2;
861
862 // for osTeleportObject
863 public const int OSTPOBJ_NONE = 0x0;
864 public const int OSTPOBJ_STOPATTARGET = 0x1; // stops at destination
865 public const int OSTPOBJ_STOPONFAIL = 0x2; // stops at jump point if tp fails
866 public const int OSTPOBJ_SETROT = 0x4; // the rotation is the final rotation, otherwise is a added rotation
867
807 } 868 }
808} 869}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 35aaf01..c39248b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Diagnostics; //for [DebuggerNonUserCode]
29using System.Runtime.Remoting.Lifetime; 30using System.Runtime.Remoting.Lifetime;
30using System.Threading; 31using System.Threading;
31using System.Reflection; 32using System.Reflection;
@@ -314,6 +315,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
314 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); 315 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
315 } 316 }
316 317
318 [DebuggerNonUserCode]
317 public void llDie() 319 public void llDie()
318 { 320 {
319 m_LSL_Functions.llDie(); 321 m_LSL_Functions.llDie();
@@ -424,6 +426,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
424 return m_LSL_Functions.llGetAttached(); 426 return m_LSL_Functions.llGetAttached();
425 } 427 }
426 428
429 public LSL_List llGetAttachedList(string id)
430 {
431 return m_LSL_Functions.llGetAttachedList(id);
432 }
433
427 public LSL_List llGetBoundingBox(string obj) 434 public LSL_List llGetBoundingBox(string obj)
428 { 435 {
429 return m_LSL_Functions.llGetBoundingBox(obj); 436 return m_LSL_Functions.llGetBoundingBox(obj);
@@ -479,6 +486,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
479 return m_LSL_Functions.llGetFreeMemory(); 486 return m_LSL_Functions.llGetFreeMemory();
480 } 487 }
481 488
489 public LSL_Integer llGetUsedMemory()
490 {
491 return m_LSL_Functions.llGetUsedMemory();
492 }
493
482 public LSL_Integer llGetFreeURLs() 494 public LSL_Integer llGetFreeURLs()
483 { 495 {
484 return m_LSL_Functions.llGetFreeURLs(); 496 return m_LSL_Functions.llGetFreeURLs();
@@ -559,11 +571,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
559 return m_LSL_Functions.llGetLinkNumberOfSides(link); 571 return m_LSL_Functions.llGetLinkNumberOfSides(link);
560 } 572 }
561 573
562 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
563 {
564 m_LSL_Functions.llSetKeyframedMotion(frames, options);
565 }
566
567 public LSL_Integer llGetListEntryType(LSL_List src, int index) 574 public LSL_Integer llGetListEntryType(LSL_List src, int index)
568 { 575 {
569 return m_LSL_Functions.llGetListEntryType(src, index); 576 return m_LSL_Functions.llGetListEntryType(src, index);
@@ -859,11 +866,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
859 return m_LSL_Functions.llGetUnixTime(); 866 return m_LSL_Functions.llGetUnixTime();
860 } 867 }
861 868
862 public LSL_Integer llGetUsedMemory()
863 {
864 return m_LSL_Functions.llGetUsedMemory();
865 }
866
867 public LSL_Vector llGetVel() 869 public LSL_Vector llGetVel()
868 { 870 {
869 return m_LSL_Functions.llGetVel(); 871 return m_LSL_Functions.llGetVel();
@@ -884,9 +886,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
884 m_LSL_Functions.llGiveInventoryList(destination, category, inventory); 886 m_LSL_Functions.llGiveInventoryList(destination, category, inventory);
885 } 887 }
886 888
887 public void llGiveMoney(string destination, int amount) 889 public LSL_Integer llGiveMoney(string destination, int amount)
888 { 890 {
889 m_LSL_Functions.llGiveMoney(destination, amount); 891 return m_LSL_Functions.llGiveMoney(destination, amount);
890 } 892 }
891 893
892 public LSL_String llTransferLindenDollars(string destination, int amount) 894 public LSL_String llTransferLindenDollars(string destination, int amount)
@@ -1463,6 +1465,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1463 m_LSL_Functions.llSay(channelID, text); 1465 m_LSL_Functions.llSay(channelID, text);
1464 } 1466 }
1465 1467
1468 public LSL_Integer llScaleByFactor(double scaling_factor)
1469 {
1470 return m_LSL_Functions.llScaleByFactor(scaling_factor);
1471 }
1472
1473 public LSL_Float llGetMaxScaleFactor()
1474 {
1475 return m_LSL_Functions.llGetMaxScaleFactor();
1476 }
1477
1478 public LSL_Float llGetMinScaleFactor()
1479 {
1480 return m_LSL_Functions.llGetMinScaleFactor();
1481 }
1482
1466 public void llScaleTexture(double u, double v, int face) 1483 public void llScaleTexture(double u, double v, int face)
1467 { 1484 {
1468 m_LSL_Functions.llScaleTexture(u, v, face); 1485 m_LSL_Functions.llScaleTexture(u, v, face);
@@ -1563,6 +1580,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1563 m_LSL_Functions.llSetVelocity(force, local); 1580 m_LSL_Functions.llSetVelocity(force, local);
1564 } 1581 }
1565 1582
1583
1566 public void llSetAngularVelocity(LSL_Vector force, int local) 1584 public void llSetAngularVelocity(LSL_Vector force, int local)
1567 { 1585 {
1568 m_LSL_Functions.llSetAngularVelocity(force, local); 1586 m_LSL_Functions.llSetAngularVelocity(force, local);
@@ -1643,6 +1661,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1643 m_LSL_Functions.llSetPos(pos); 1661 m_LSL_Functions.llSetPos(pos);
1644 } 1662 }
1645 1663
1664 public LSL_Integer llSetRegionPos(LSL_Vector pos)
1665 {
1666 return m_LSL_Functions.llSetRegionPos(pos);
1667 }
1668
1646 public void llSetPrimitiveParams(LSL_List rules) 1669 public void llSetPrimitiveParams(LSL_List rules)
1647 { 1670 {
1648 m_LSL_Functions.llSetPrimitiveParams(rules); 1671 m_LSL_Functions.llSetPrimitiveParams(rules);
@@ -1658,11 +1681,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1658 m_LSL_Functions.llSetPrimURL(url); 1681 m_LSL_Functions.llSetPrimURL(url);
1659 } 1682 }
1660 1683
1661 public LSL_Integer llSetRegionPos(LSL_Vector pos)
1662 {
1663 return m_LSL_Functions.llSetRegionPos(pos);
1664 }
1665
1666 public void llSetRemoteScriptAccessPin(int pin) 1684 public void llSetRemoteScriptAccessPin(int pin)
1667 { 1685 {
1668 m_LSL_Functions.llSetRemoteScriptAccessPin(pin); 1686 m_LSL_Functions.llSetRemoteScriptAccessPin(pin);
@@ -1977,7 +1995,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1977 { 1995 {
1978 return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); 1996 return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2);
1979 } 1997 }
1980 1998
1981 public LSL_List llGetPrimMediaParams(int face, LSL_List rules) 1999 public LSL_List llGetPrimMediaParams(int face, LSL_List rules)
1982 { 2000 {
1983 return m_LSL_Functions.llGetPrimMediaParams(face, rules); 2001 return m_LSL_Functions.llGetPrimMediaParams(face, rules);
@@ -2008,9 +2026,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
2008 return m_LSL_Functions.llClearLinkMedia(link, face); 2026 return m_LSL_Functions.llClearLinkMedia(link, face);
2009 } 2027 }
2010 2028
2011 public void print(string str) 2029 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
2030 {
2031 return m_LSL_Functions.llGetLinkNumberOfSides(link);
2032 }
2033
2034 public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
2035 {
2036 m_LSL_Functions.llSetKeyframedMotion(frames, options);
2037 }
2038
2039 public void llSetPhysicsMaterial(int material_bits, LSL_Float material_gravity_modifier, LSL_Float material_restitution, LSL_Float material_friction, LSL_Float material_density)
2040 {
2041 m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density);
2042 }
2043
2044 public LSL_List llGetPhysicsMaterial()
2045 {
2046 return m_LSL_Functions.llGetPhysicsMaterial();
2047 }
2048
2049 public void llSetAnimationOverride(LSL_String animState, LSL_String anim)
2050 {
2051 m_LSL_Functions.llSetAnimationOverride(animState, anim);
2052 }
2053
2054 public void llResetAnimationOverride(LSL_String anim_state)
2055 {
2056 m_LSL_Functions.llResetAnimationOverride(anim_state);
2057 }
2058
2059 public LSL_String llGetAnimationOverride(LSL_String anim_state)
2060 {
2061 return m_LSL_Functions.llGetAnimationOverride(anim_state);
2062 }
2063
2064 public LSL_String llJsonGetValue(LSL_String json, LSL_List specifiers)
2065 {
2066 return m_LSL_Functions.llJsonGetValue(json, specifiers);
2067 }
2068
2069 public LSL_List llJson2List(LSL_String json)
2070 {
2071 return m_LSL_Functions.llJson2List(json);
2072 }
2073
2074 public LSL_String llList2Json(LSL_String type, LSL_List values)
2075 {
2076 return m_LSL_Functions.llList2Json(type, values);
2077 }
2078
2079 public LSL_String llJsonSetValue(LSL_String json, LSL_List specifiers, LSL_String value)
2080 {
2081 return m_LSL_Functions.llJsonSetValue(json, specifiers, value);
2082 }
2083
2084 public LSL_String llJsonValueType(LSL_String json, LSL_List specifiers)
2012 { 2085 {
2013 m_LSL_Functions.print(str); 2086 return m_LSL_Functions.llJsonValueType(json, specifiers);
2014 } 2087 }
2015 } 2088 }
2016} 2089}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index 143b497..2e27f16 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -72,9 +72,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
72 { 72 {
73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target); 73 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
74 } 74 }
75
75 public void lsClearWindlightScene() 76 public void lsClearWindlightScene()
76 { 77 {
77 m_LS_Functions.lsClearWindlightScene(); 78 m_LS_Functions.lsClearWindlightScene();
78 } 79 }
80
81 public LSL_List cmGetWindlightScene(LSL_List rules)
82 {
83 return m_LS_Functions.lsGetWindlightScene(rules);
84 }
85
86 public int cmSetWindlightScene(LSL_List rules)
87 {
88 return m_LS_Functions.lsSetWindlightScene(rules);
89 }
90
91 public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
92 {
93 return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
94 }
95
96 public void cmClearWindlightScene()
97 {
98 m_LS_Functions.lsClearWindlightScene();
99 }
79 } 100 }
80} 101}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index a60f381..30ff764 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -153,6 +153,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
153 return m_OSSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer); 153 return m_OSSL_Functions.osSetDynamicTextureData(dynamicID, contentType, data, extraParams, timer);
154 } 154 }
155 155
156 public string osSetDynamicTextureDataFace(string dynamicID, string contentType, string data, string extraParams,
157 int timer, int face)
158 {
159 return m_OSSL_Functions.osSetDynamicTextureDataFace(dynamicID, contentType, data, extraParams, timer, face);
160 }
161
156 public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, 162 public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,
157 int timer, int alpha) 163 int timer, int alpha)
158 { 164 {
@@ -209,6 +215,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
209 return m_OSSL_Functions.osRegionRestart(seconds); 215 return m_OSSL_Functions.osRegionRestart(seconds);
210 } 216 }
211 217
218 public int osRegionRestart(double seconds, string msg)
219 {
220 return m_OSSL_Functions.osRegionRestart(seconds, msg);
221 }
222
212 public void osRegionNotice(string msg) 223 public void osRegionNotice(string msg)
213 { 224 {
214 m_OSSL_Functions.osRegionNotice(msg); 225 m_OSSL_Functions.osRegionNotice(msg);
@@ -266,15 +277,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
266 m_OSSL_Functions.osTeleportOwner(position, lookat); 277 m_OSSL_Functions.osTeleportOwner(position, lookat);
267 } 278 }
268 279
269 // Avatar info functions 280 public LSL_List osGetAgents()
270 public string osGetAgentIP(string agent)
271 { 281 {
272 return m_OSSL_Functions.osGetAgentIP(agent); 282 return m_OSSL_Functions.osGetAgents();
273 } 283 }
274 284
275 public LSL_List osGetAgents() 285 public string osGetAgentIP(string agent)
276 { 286 {
277 return m_OSSL_Functions.osGetAgents(); 287 return m_OSSL_Functions.osGetAgentIP(agent);
278 } 288 }
279 289
280 // Animation Functions 290 // Animation Functions
@@ -350,6 +360,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
350 return m_OSSL_Functions.osDrawEllipse(drawList, width, height); 360 return m_OSSL_Functions.osDrawEllipse(drawList, width, height);
351 } 361 }
352 362
363 public string osDrawFilledEllipse(string drawList, int width, int height)
364 {
365 return m_OSSL_Functions.osDrawFilledEllipse(drawList, width, height);
366 }
367
353 public string osDrawRectangle(string drawList, int width, int height) 368 public string osDrawRectangle(string drawList, int width, int height)
354 { 369 {
355 return m_OSSL_Functions.osDrawRectangle(drawList, width, height); 370 return m_OSSL_Functions.osDrawRectangle(drawList, width, height);
@@ -370,6 +385,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
370 return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y); 385 return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y);
371 } 386 }
372 387
388 public string osDrawResetTransform(string drawList)
389 {
390 return m_OSSL_Functions.osDrawResetTransform(drawList);
391 }
392
393 public string osDrawRotationTransform(string drawList, LSL_Float x)
394 {
395 return m_OSSL_Functions.osDrawRotationTransform(drawList, x);
396 }
397
398 public string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y)
399 {
400 return m_OSSL_Functions.osDrawScaleTransform(drawList, x, y);
401 }
402
403 public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y)
404 {
405 return m_OSSL_Functions.osDrawTranslationTransform(drawList, x, y);
406 }
407
373 public string osSetFontSize(string drawList, int fontSize) 408 public string osSetFontSize(string drawList, int fontSize)
374 { 409 {
375 return m_OSSL_Functions.osSetFontSize(drawList, fontSize); 410 return m_OSSL_Functions.osSetFontSize(drawList, fontSize);
@@ -394,6 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
394 { 429 {
395 return m_OSSL_Functions.osSetPenColor(drawList, color); 430 return m_OSSL_Functions.osSetPenColor(drawList, color);
396 } 431 }
432
397 // Deprecated 433 // Deprecated
398 public string osSetPenColour(string drawList, string colour) 434 public string osSetPenColour(string drawList, string colour)
399 { 435 {
@@ -430,6 +466,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
430 return m_OSSL_Functions.osGetPhysicsEngineType(); 466 return m_OSSL_Functions.osGetPhysicsEngineType();
431 } 467 }
432 468
469 public string osGetPhysicsEngineName()
470 {
471 return m_OSSL_Functions.osGetPhysicsEngineName();
472 }
473
433 public string osGetSimulatorVersion() 474 public string osGetSimulatorVersion()
434 { 475 {
435 return m_OSSL_Functions.osGetSimulatorVersion(); 476 return m_OSSL_Functions.osGetSimulatorVersion();
@@ -439,7 +480,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
439 { 480 {
440 return m_OSSL_Functions.osParseJSON(JSON); 481 return m_OSSL_Functions.osParseJSON(JSON);
441 } 482 }
442 483
443 public Object osParseJSONNew(string JSON) 484 public Object osParseJSONNew(string JSON)
444 { 485 {
445 return m_OSSL_Functions.osParseJSONNew(JSON); 486 return m_OSSL_Functions.osParseJSONNew(JSON);
@@ -529,7 +570,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
529 { 570 {
530 return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start); 571 return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start);
531 } 572 }
532 573
533 574
534 // Information about data loaded into the region 575 // Information about data loaded into the region
535 public string osLoadedCreationDate() 576 public string osLoadedCreationDate()
@@ -567,6 +608,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
567 m_OSSL_Functions.osForceBreakAllLinks(); 608 m_OSSL_Functions.osForceBreakAllLinks();
568 } 609 }
569 610
611 public void osDie(LSL_Key objectUUID)
612 {
613 m_OSSL_Functions.osDie(objectUUID);
614 }
615
570 public LSL_Integer osIsNpc(LSL_Key npc) 616 public LSL_Integer osIsNpc(LSL_Key npc)
571 { 617 {
572 return m_OSSL_Functions.osIsNpc(npc); 618 return m_OSSL_Functions.osIsNpc(npc);
@@ -627,6 +673,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
627 m_OSSL_Functions.osNpcStopMoveToTarget(npc); 673 m_OSSL_Functions.osNpcStopMoveToTarget(npc);
628 } 674 }
629 675
676 public void osNpcSetProfileAbout(LSL_Key npc, string about)
677 {
678 m_OSSL_Functions.osNpcSetProfileAbout(npc, about);
679 }
680
681 public void osNpcSetProfileImage(LSL_Key npc, string image)
682 {
683 m_OSSL_Functions.osNpcSetProfileImage(npc, image);
684 }
685
630 public void osNpcSay(key npc, string message) 686 public void osNpcSay(key npc, string message)
631 { 687 {
632 m_OSSL_Functions.osNpcSay(npc, message); 688 m_OSSL_Functions.osNpcSay(npc, message);
@@ -744,14 +800,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
744 if (Position.y > ((int)Constants.RegionSize - 1)) 800 if (Position.y > ((int)Constants.RegionSize - 1))
745 Position.y = ((int)Constants.RegionSize - 1); 801 Position.y = ((int)Constants.RegionSize - 1);
746 */ 802 */
747 if (Position.z > Constants.RegionHeight)
748 Position.z = Constants.RegionHeight;
749 if (Position.x < 0) 803 if (Position.x < 0)
750 Position.x = 0; 804 Position.x = 0;
751 if (Position.y < 0) 805 if (Position.y < 0)
752 Position.y = 0; 806 Position.y = 0;
753 if (Position.z < 0) 807 if (Position.z < 0)
754 Position.z = 0; 808 Position.z = 0;
809 if (Position.z > Constants.RegionHeight)
810 Position.z = Constants.RegionHeight;
755 prim.OSSL.llSetPos(Position); 811 prim.OSSL.llSetPos(Position);
756 } 812 }
757 813
@@ -889,7 +945,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
889 { 945 {
890 return m_OSSL_Functions.osGetRegionMapTexture(regionName); 946 return m_OSSL_Functions.osGetRegionMapTexture(regionName);
891 } 947 }
892 948
893 public LSL_List osGetRegionStats() 949 public LSL_List osGetRegionStats()
894 { 950 {
895 return m_OSSL_Functions.osGetRegionStats(); 951 return m_OSSL_Functions.osGetRegionStats();
@@ -902,19 +958,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
902 958
903 /// <summary> 959 /// <summary>
904 /// Returns the amount of memory in use by the Simulator Daemon. 960 /// Returns the amount of memory in use by the Simulator Daemon.
905 /// Amount in bytes - if >= 4GB, returns 4GB. (LSL is not 64-bit aware) 961 /// Amount in bytes - if >= 2GB, returns 2GB. (LSL is not 64-bit aware)
906 /// </summary> 962 /// </summary>
907 /// <returns></returns> 963 /// <returns></returns>
908 public LSL_Integer osGetSimulatorMemory() 964 public LSL_Integer osGetSimulatorMemory()
909 { 965 {
910 return m_OSSL_Functions.osGetSimulatorMemory(); 966 return m_OSSL_Functions.osGetSimulatorMemory();
911 } 967 }
912 968
969 public LSL_Integer osGetSimulatorMemoryKB()
970 {
971 return m_OSSL_Functions.osGetSimulatorMemoryKB();
972 }
973
913 public void osKickAvatar(string FirstName,string SurName,string alert) 974 public void osKickAvatar(string FirstName,string SurName,string alert)
914 { 975 {
915 m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); 976 m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert);
916 } 977 }
917 978
918 public void osSetSpeed(string UUID, LSL_Float SpeedModifier) 979 public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
919 { 980 {
920 m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); 981 m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier);
@@ -929,12 +990,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
929 { 990 {
930 m_OSSL_Functions.osCauseDamage(avatar, damage); 991 m_OSSL_Functions.osCauseDamage(avatar, damage);
931 } 992 }
932 993
933 public void osCauseHealing(string avatar, double healing) 994 public void osCauseHealing(string avatar, double healing)
934 { 995 {
935 m_OSSL_Functions.osCauseHealing(avatar, healing); 996 m_OSSL_Functions.osCauseHealing(avatar, healing);
936 } 997 }
937 998
999 public void osSetHealth(string avatar, double health)
1000 {
1001 m_OSSL_Functions.osSetHealth(avatar, health);
1002 }
1003
1004 public void osSetHealRate(string avatar, double health)
1005 {
1006 m_OSSL_Functions.osSetHealRate(avatar, health);
1007 }
1008
1009 public LSL_Float osGetHealRate(string avatar)
1010 {
1011 return m_OSSL_Functions.osGetHealRate(avatar);
1012 }
1013
938 public void osForceOtherSit(string avatar) 1014 public void osForceOtherSit(string avatar)
939 { 1015 {
940 m_OSSL_Functions.osForceOtherSit(avatar); 1016 m_OSSL_Functions.osForceOtherSit(avatar);
@@ -944,12 +1020,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
944 { 1020 {
945 m_OSSL_Functions.osForceOtherSit(avatar, target); 1021 m_OSSL_Functions.osForceOtherSit(avatar, target);
946 } 1022 }
947 1023
948 public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules) 1024 public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules)
949 { 1025 {
950 return m_OSSL_Functions.osGetPrimitiveParams(prim, rules); 1026 return m_OSSL_Functions.osGetPrimitiveParams(prim, rules);
951 } 1027 }
952 1028
953 public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules) 1029 public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules)
954 { 1030 {
955 m_OSSL_Functions.osSetPrimitiveParams(prim, rules); 1031 m_OSSL_Functions.osSetPrimitiveParams(prim, rules);
@@ -970,6 +1046,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
970 return m_OSSL_Functions.osGetAvatarList(); 1046 return m_OSSL_Functions.osGetAvatarList();
971 } 1047 }
972 1048
1049 public LSL_List osGetNPCList()
1050 {
1051 return m_OSSL_Functions.osGetNPCList();
1052 }
1053
973 public LSL_String osUnixTimeToTimestamp(long time) 1054 public LSL_String osUnixTimeToTimestamp(long time)
974 { 1055 {
975 return m_OSSL_Functions.osUnixTimeToTimestamp(time); 1056 return m_OSSL_Functions.osUnixTimeToTimestamp(time);
@@ -1054,5 +1135,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1054 { 1135 {
1055 return m_OSSL_Functions.osRegexIsMatch(input, pattern); 1136 return m_OSSL_Functions.osRegexIsMatch(input, pattern);
1056 } 1137 }
1138
1139 public LSL_String osRequestURL(LSL_List options)
1140 {
1141 return m_OSSL_Functions.osRequestURL(options);
1142 }
1143
1144 public LSL_String osRequestSecureURL(LSL_List options)
1145 {
1146 return m_OSSL_Functions.osRequestSecureURL(options);
1147 }
1148
1149 public void osCollisionSound(string impact_sound, double impact_volume)
1150 {
1151 m_OSSL_Functions.osCollisionSound(impact_sound, impact_volume);
1152 }
1153
1154 public void osVolumeDetect(int detect)
1155 {
1156 m_OSSL_Functions.osVolumeDetect(detect);
1157 }
1158
1159 public LSL_List osGetInertiaData()
1160 {
1161 return m_OSSL_Functions.osGetInertiaData();
1162 }
1163
1164 public void osSetInertia(LSL_Float mass, vector centerOfMass, vector principalInertiaScaled, rotation rot)
1165 {
1166 m_OSSL_Functions.osSetInertia(mass, centerOfMass, principalInertiaScaled, rot);
1167 }
1168
1169 public void osSetInertiaAsBox(LSL_Float mass, vector boxSize, vector centerOfMass, rotation rot)
1170 {
1171 m_OSSL_Functions.osSetInertiaAsBox(mass, boxSize, centerOfMass, rot);
1172 }
1173
1174 public void osSetInertiaAsSphere(LSL_Float mass, LSL_Float radius, vector centerOfMass)
1175 {
1176 m_OSSL_Functions.osSetInertiaAsSphere(mass, radius, centerOfMass);
1177 }
1178
1179 public void osSetInertiaAsCylinder(LSL_Float mass, LSL_Float radius, LSL_Float lenght, vector centerOfMass,rotation lslrot)
1180 {
1181 m_OSSL_Functions.osSetInertiaAsCylinder( mass, radius, lenght, centerOfMass, lslrot);
1182 }
1183
1184 public void osClearInertia()
1185 {
1186 m_OSSL_Functions.osClearInertia();
1187 }
1188
1189 public LSL_Integer osTeleportObject(LSL_Key objectUUID, vector targetPos, rotation targetrotation, LSL_Integer flags)
1190 {
1191 return m_OSSL_Functions.osTeleportObject(objectUUID, targetPos, targetrotation, flags);
1192 }
1193
1194 public LSL_Integer osGetLinkNumber(LSL_String name)
1195 {
1196 return m_OSSL_Functions.osGetLinkNumber(name);
1197 }
1057 } 1198 }
1058} 1199}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
deleted file mode 100644
index f02d2d9..0000000
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
+++ /dev/null
@@ -1,48 +0,0 @@
1<Project name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" description="" standardNamespace="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" newfilesearch="None" enableviewstate="True" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
2 <Configurations active="Debug">
3 <Configuration name="Debug" ctype="DotNetProjectConfiguration">
4 <Output directory="./../../../../../../bin/" assembly="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" executeScript="" executeBeforeBuild="" executeAfterBuild="" executeBeforeBuildArguments="" executeAfterBuildArguments="" />
5 <Build debugmode="True" target="Library" />
6 <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
7 <CodeGeneration compiler="Csc" warninglevel="4" nowarn="" includedebuginformation="True" optimize="False" unsafecodeallowed="False" generateoverflowchecks="False" mainclass="" target="Library" definesymbols="TRACE;DEBUG" generatexmldocumentation="False" win32Icon="" ctype="CSharpCompilerParameters" />
8 </Configuration>
9 <Configuration name="Release" ctype="DotNetProjectConfiguration">
10 <Output directory="./../../../../../../bin/" assembly="OpenSim.Region.ScriptEngine.Shared.Api.Runtime" executeScript="" executeBeforeBuild="" executeAfterBuild="" executeBeforeBuildArguments="" executeAfterBuildArguments="" />
11 <Build debugmode="True" target="Library" />
12 <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
13 <CodeGeneration compiler="Csc" warninglevel="4" nowarn="" includedebuginformation="False" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" mainclass="" target="Library" definesymbols="TRACE" generatexmldocumentation="False" win32Icon="" ctype="CSharpCompilerParameters" />
14 </Configuration>
15 </Configurations>
16 <DeploymentInformation target="" script="" strategy="File">
17 <excludeFiles />
18 </DeploymentInformation>
19 <Contents>
20 <File name="./CM_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
21 <File name="./Executor.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
22 <File name="./LSL_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
23 <File name="./LSL_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
24 <File name="./LS_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
25 <File name="./MOD_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
26 <File name="./OSSL_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
27 <File name="./ScriptBase.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
28 <File name="./ScriptSponsor.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
29 </Contents>
30 <References>
31 <ProjectReference type="Assembly" refto="../../../../../../bin/log4net.dll" localcopy="False" />
32 <ProjectReference type="Assembly" refto="../../../../../../bin/Nini.dll" localcopy="False" />
33 <ProjectReference type="Assembly" refto="../../../../../../bin/Nini.dll" localcopy="False" />
34 <ProjectReference type="Assembly" refto="../../../../../../bin/OpenMetaverseTypes.dll" localcopy="False" />
35 <ProjectReference type="Project" localcopy="False" refto="OpenSim" />
36 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework" />
37 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" />
38 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Console" />
39 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.CoreModules" />
40 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Framework" />
41 <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.ScriptEngine.Shared" />
42 <ProjectReference type="Assembly" refto="../../../../../../bin/RAIL.dll" localcopy="False" />
43 <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
44 <ProjectReference type="Gac" localcopy="False" refto="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
45 <ProjectReference type="Gac" localcopy="False" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
46 <ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
47 </References>
48</Project>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs
index b1825ac..81020f1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api.Runtime")] 8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api.Runtime")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index edbbc2a..b138da3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -33,6 +33,7 @@ using System.Threading;
33using System.Reflection; 33using System.Reflection;
34using System.Collections; 34using System.Collections;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.Diagnostics; //for [DebuggerNonUserCode]
36using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared; 38using OpenSim.Region.ScriptEngine.Shared;
38using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; 39using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
@@ -90,6 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
90 return (int)m_Executor.GetStateEventFlags(state); 91 return (int)m_Executor.GetStateEventFlags(state);
91 } 92 }
92 93
94 [DebuggerNonUserCode]
93 public void ExecuteEvent(string state, string FunctionName, object[] args) 95 public void ExecuteEvent(string state, string FunctionName, object[] args)
94 { 96 {
95 m_Executor.ExecuteEvent(state, FunctionName, args); 97 m_Executor.ExecuteEvent(state, FunctionName, args);