diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
8 files changed, 186 insertions, 72 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 | |||
28 | using System; | ||
29 | using System.Runtime.Remoting.Lifetime; | ||
30 | using System.Threading; | ||
31 | using System.Reflection; | ||
32 | using System.Collections; | ||
33 | using System.Collections.Generic; | ||
34 | using OpenSim.Framework; | ||
35 | using OpenSim.Region.Framework.Interfaces; | ||
36 | using OpenSim.Region.ScriptEngine.Interfaces; | ||
37 | using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; | ||
38 | using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
39 | using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; | ||
40 | using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; | ||
41 | using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
42 | using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; | ||
43 | using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; | ||
44 | using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; | ||
45 | using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | ||
46 | |||
47 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using System.Runtime.Remoting.Lifetime; | 32 | using System.Runtime.Remoting.Lifetime; |
32 | using OpenSim.Region.ScriptEngine.Shared; | 33 | using 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..158acc6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -57,7 +57,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
57 | public const int ACTIVE = 2; | 57 | public const int ACTIVE = 2; |
58 | public const int PASSIVE = 4; | 58 | public const int PASSIVE = 4; |
59 | public const int SCRIPTED = 8; | 59 | public const int SCRIPTED = 8; |
60 | public const int OS_NPC = 0x01000000; | ||
61 | 60 | ||
62 | public const int CONTROL_FWD = 1; | 61 | public const int CONTROL_FWD = 1; |
63 | public const int CONTROL_BACK = 2; | 62 | public const int CONTROL_BACK = 2; |
@@ -82,6 +81,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
82 | public const int PERMISSION_CHANGE_PERMISSIONS = 512; | 81 | public const int PERMISSION_CHANGE_PERMISSIONS = 512; |
83 | public const int PERMISSION_TRACK_CAMERA = 1024; | 82 | public const int PERMISSION_TRACK_CAMERA = 1024; |
84 | public const int PERMISSION_CONTROL_CAMERA = 2048; | 83 | public const int PERMISSION_CONTROL_CAMERA = 2048; |
84 | public const int PERMISSION_TELEPORT = 4096; | ||
85 | public const int PERMISSION_OVERRIDE_ANIMATIONS = 0x8000; | ||
85 | 86 | ||
86 | public const int AGENT_FLYING = 1; | 87 | public const int AGENT_FLYING = 1; |
87 | public const int AGENT_ATTACHMENTS = 2; | 88 | public const int AGENT_ATTACHMENTS = 2; |
@@ -96,6 +97,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
96 | public const int AGENT_CROUCHING = 1024; | 97 | public const int AGENT_CROUCHING = 1024; |
97 | public const int AGENT_BUSY = 2048; | 98 | public const int AGENT_BUSY = 2048; |
98 | public const int AGENT_ALWAYS_RUN = 4096; | 99 | public const int AGENT_ALWAYS_RUN = 4096; |
100 | public const int AGENT_MALE = 8192; | ||
99 | 101 | ||
100 | //Particle Systems | 102 | //Particle Systems |
101 | public const int PSYS_PART_INTERP_COLOR_MASK = 1; | 103 | public const int PSYS_PART_INTERP_COLOR_MASK = 1; |
@@ -353,6 +355,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
353 | public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART | 355 | public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART |
354 | public const int CHANGED_MEDIA = 2048; | 356 | public const int CHANGED_MEDIA = 2048; |
355 | public const int CHANGED_ANIMATION = 16384; | 357 | public const int CHANGED_ANIMATION = 16384; |
358 | public const int CHANGED_POSITION = 32768; | ||
356 | public const int TYPE_INVALID = 0; | 359 | public const int TYPE_INVALID = 0; |
357 | public const int TYPE_INTEGER = 1; | 360 | public const int TYPE_INTEGER = 1; |
358 | public const int TYPE_FLOAT = 2; | 361 | public const int TYPE_FLOAT = 2; |
@@ -708,7 +711,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
708 | public const int FRICTION = 2; | 711 | public const int FRICTION = 2; |
709 | public const int RESTITUTION = 4; | 712 | public const int RESTITUTION = 4; |
710 | public const int GRAVITY_MULTIPLIER = 8; | 713 | public const int GRAVITY_MULTIPLIER = 8; |
711 | 714 | ||
712 | // extra constants for llSetPrimMediaParams | 715 | // extra constants for llSetPrimMediaParams |
713 | public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); | 716 | public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); |
714 | public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000); | 717 | public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000); |
@@ -795,6 +798,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
795 | public const int KFM_CMD_STOP = 1; | 798 | public const int KFM_CMD_STOP = 1; |
796 | public const int KFM_CMD_PAUSE = 2; | 799 | public const int KFM_CMD_PAUSE = 2; |
797 | 800 | ||
801 | public const string JSON_ARRAY = "JSON_ARRAY"; | ||
802 | public const string JSON_OBJECT = "JSON_OBJECT"; | ||
803 | public const string JSON_INVALID = "JSON_INVALID"; | ||
804 | public const string JSON_NUMBER = "JSON_NUMBER"; | ||
805 | public const string JSON_STRING = "JSON_STRING"; | ||
806 | public const string JSON_TRUE = "JSON_TRUE"; | ||
807 | public const string JSON_FALSE = "JSON_FALSE"; | ||
808 | public const string JSON_NULL = "JSON_NULL"; | ||
809 | public const string JSON_APPEND = "JSON_APPEND"; | ||
810 | |||
798 | /// <summary> | 811 | /// <summary> |
799 | /// process name parameter as regex | 812 | /// process name parameter as regex |
800 | /// </summary> | 813 | /// </summary> |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 35aaf01..cea66d2 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
29 | using System.Runtime.Remoting.Lifetime; | 30 | using System.Runtime.Remoting.Lifetime; |
30 | using System.Threading; | 31 | using System.Threading; |
31 | using System.Reflection; | 32 | using 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(); |
@@ -479,6 +481,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
479 | return m_LSL_Functions.llGetFreeMemory(); | 481 | return m_LSL_Functions.llGetFreeMemory(); |
480 | } | 482 | } |
481 | 483 | ||
484 | public LSL_Integer llGetUsedMemory() | ||
485 | { | ||
486 | return m_LSL_Functions.llGetUsedMemory(); | ||
487 | } | ||
488 | |||
482 | public LSL_Integer llGetFreeURLs() | 489 | public LSL_Integer llGetFreeURLs() |
483 | { | 490 | { |
484 | return m_LSL_Functions.llGetFreeURLs(); | 491 | return m_LSL_Functions.llGetFreeURLs(); |
@@ -559,11 +566,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
559 | return m_LSL_Functions.llGetLinkNumberOfSides(link); | 566 | return m_LSL_Functions.llGetLinkNumberOfSides(link); |
560 | } | 567 | } |
561 | 568 | ||
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) | 569 | public LSL_Integer llGetListEntryType(LSL_List src, int index) |
568 | { | 570 | { |
569 | return m_LSL_Functions.llGetListEntryType(src, index); | 571 | return m_LSL_Functions.llGetListEntryType(src, index); |
@@ -859,11 +861,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
859 | return m_LSL_Functions.llGetUnixTime(); | 861 | return m_LSL_Functions.llGetUnixTime(); |
860 | } | 862 | } |
861 | 863 | ||
862 | public LSL_Integer llGetUsedMemory() | ||
863 | { | ||
864 | return m_LSL_Functions.llGetUsedMemory(); | ||
865 | } | ||
866 | |||
867 | public LSL_Vector llGetVel() | 864 | public LSL_Vector llGetVel() |
868 | { | 865 | { |
869 | return m_LSL_Functions.llGetVel(); | 866 | return m_LSL_Functions.llGetVel(); |
@@ -884,9 +881,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
884 | m_LSL_Functions.llGiveInventoryList(destination, category, inventory); | 881 | m_LSL_Functions.llGiveInventoryList(destination, category, inventory); |
885 | } | 882 | } |
886 | 883 | ||
887 | public void llGiveMoney(string destination, int amount) | 884 | public LSL_Integer llGiveMoney(string destination, int amount) |
888 | { | 885 | { |
889 | m_LSL_Functions.llGiveMoney(destination, amount); | 886 | return m_LSL_Functions.llGiveMoney(destination, amount); |
890 | } | 887 | } |
891 | 888 | ||
892 | public LSL_String llTransferLindenDollars(string destination, int amount) | 889 | public LSL_String llTransferLindenDollars(string destination, int amount) |
@@ -1563,6 +1560,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1563 | m_LSL_Functions.llSetVelocity(force, local); | 1560 | m_LSL_Functions.llSetVelocity(force, local); |
1564 | } | 1561 | } |
1565 | 1562 | ||
1563 | |||
1566 | public void llSetAngularVelocity(LSL_Vector force, int local) | 1564 | public void llSetAngularVelocity(LSL_Vector force, int local) |
1567 | { | 1565 | { |
1568 | m_LSL_Functions.llSetAngularVelocity(force, local); | 1566 | m_LSL_Functions.llSetAngularVelocity(force, local); |
@@ -1643,6 +1641,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1643 | m_LSL_Functions.llSetPos(pos); | 1641 | m_LSL_Functions.llSetPos(pos); |
1644 | } | 1642 | } |
1645 | 1643 | ||
1644 | public LSL_Integer llSetRegionPos(LSL_Vector pos) | ||
1645 | { | ||
1646 | return m_LSL_Functions.llSetRegionPos(pos); | ||
1647 | } | ||
1648 | |||
1646 | public void llSetPrimitiveParams(LSL_List rules) | 1649 | public void llSetPrimitiveParams(LSL_List rules) |
1647 | { | 1650 | { |
1648 | m_LSL_Functions.llSetPrimitiveParams(rules); | 1651 | m_LSL_Functions.llSetPrimitiveParams(rules); |
@@ -1658,11 +1661,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1658 | m_LSL_Functions.llSetPrimURL(url); | 1661 | m_LSL_Functions.llSetPrimURL(url); |
1659 | } | 1662 | } |
1660 | 1663 | ||
1661 | public LSL_Integer llSetRegionPos(LSL_Vector pos) | ||
1662 | { | ||
1663 | return m_LSL_Functions.llSetRegionPos(pos); | ||
1664 | } | ||
1665 | |||
1666 | public void llSetRemoteScriptAccessPin(int pin) | 1664 | public void llSetRemoteScriptAccessPin(int pin) |
1667 | { | 1665 | { |
1668 | m_LSL_Functions.llSetRemoteScriptAccessPin(pin); | 1666 | m_LSL_Functions.llSetRemoteScriptAccessPin(pin); |
@@ -2008,9 +2006,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
2008 | return m_LSL_Functions.llClearLinkMedia(link, face); | 2006 | return m_LSL_Functions.llClearLinkMedia(link, face); |
2009 | } | 2007 | } |
2010 | 2008 | ||
2011 | public void print(string str) | 2009 | public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link) |
2010 | { | ||
2011 | return m_LSL_Functions.llGetLinkNumberOfSides(link); | ||
2012 | } | ||
2013 | |||
2014 | public void llSetKeyframedMotion(LSL_List frames, LSL_List options) | ||
2015 | { | ||
2016 | m_LSL_Functions.llSetKeyframedMotion(frames, options); | ||
2017 | } | ||
2018 | |||
2019 | public void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density) | ||
2020 | { | ||
2021 | m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density); | ||
2022 | } | ||
2023 | |||
2024 | public LSL_List llGetPhysicsMaterial() | ||
2025 | { | ||
2026 | return m_LSL_Functions.llGetPhysicsMaterial(); | ||
2027 | } | ||
2028 | |||
2029 | public void llSetAnimationOverride(LSL_String animState, LSL_String anim) | ||
2030 | { | ||
2031 | m_LSL_Functions.llSetAnimationOverride(animState, anim); | ||
2032 | } | ||
2033 | |||
2034 | public void llResetAnimationOverride(LSL_String anim_state) | ||
2035 | { | ||
2036 | m_LSL_Functions.llResetAnimationOverride(anim_state); | ||
2037 | } | ||
2038 | |||
2039 | public LSL_String llGetAnimationOverride(LSL_String anim_state) | ||
2040 | { | ||
2041 | return m_LSL_Functions.llGetAnimationOverride(anim_state); | ||
2042 | } | ||
2043 | |||
2044 | public LSL_String llJsonGetValue(LSL_String json, LSL_List specifiers) | ||
2045 | { | ||
2046 | return m_LSL_Functions.llJsonGetValue(json, specifiers); | ||
2047 | } | ||
2048 | |||
2049 | public LSL_List llJson2List(LSL_String json) | ||
2050 | { | ||
2051 | return m_LSL_Functions.llJson2List(json); | ||
2052 | } | ||
2053 | |||
2054 | public LSL_String llList2Json(LSL_String type, LSL_List values) | ||
2055 | { | ||
2056 | return m_LSL_Functions.llList2Json(type, values); | ||
2057 | } | ||
2058 | |||
2059 | public LSL_String llJsonSetValue(LSL_String json, LSL_List specifiers, LSL_String value) | ||
2060 | { | ||
2061 | return m_LSL_Functions.llJsonSetValue(json, specifiers, value); | ||
2062 | } | ||
2063 | |||
2064 | public LSL_String llJsonValueType(LSL_String json, LSL_List specifiers) | ||
2012 | { | 2065 | { |
2013 | m_LSL_Functions.print(str); | 2066 | return m_LSL_Functions.llJsonValueType(json, specifiers); |
2014 | } | 2067 | } |
2015 | } | 2068 | } |
2016 | } | 2069 | } |
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..31393bb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -439,7 +439,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
439 | { | 439 | { |
440 | return m_OSSL_Functions.osParseJSON(JSON); | 440 | return m_OSSL_Functions.osParseJSON(JSON); |
441 | } | 441 | } |
442 | 442 | ||
443 | public Object osParseJSONNew(string JSON) | 443 | public Object osParseJSONNew(string JSON) |
444 | { | 444 | { |
445 | return m_OSSL_Functions.osParseJSONNew(JSON); | 445 | return m_OSSL_Functions.osParseJSONNew(JSON); |
@@ -744,14 +744,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
744 | if (Position.y > ((int)Constants.RegionSize - 1)) | 744 | if (Position.y > ((int)Constants.RegionSize - 1)) |
745 | Position.y = ((int)Constants.RegionSize - 1); | 745 | Position.y = ((int)Constants.RegionSize - 1); |
746 | */ | 746 | */ |
747 | if (Position.z > Constants.RegionHeight) | ||
748 | Position.z = Constants.RegionHeight; | ||
749 | if (Position.x < 0) | 747 | if (Position.x < 0) |
750 | Position.x = 0; | 748 | Position.x = 0; |
751 | if (Position.y < 0) | 749 | if (Position.y < 0) |
752 | Position.y = 0; | 750 | Position.y = 0; |
753 | if (Position.z < 0) | 751 | if (Position.z < 0) |
754 | Position.z = 0; | 752 | Position.z = 0; |
753 | if (Position.z > Constants.RegionHeight) | ||
754 | Position.z = Constants.RegionHeight; | ||
755 | prim.OSSL.llSetPos(Position); | 755 | prim.OSSL.llSetPos(Position); |
756 | } | 756 | } |
757 | 757 | ||
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/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; | |||
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using System.Collections; | 34 | using System.Collections; |
35 | using System.Collections.Generic; | 35 | using System.Collections.Generic; |
36 | using System.Diagnostics; //for [DebuggerNonUserCode] | ||
36 | using OpenSim.Region.ScriptEngine.Interfaces; | 37 | using OpenSim.Region.ScriptEngine.Interfaces; |
37 | using OpenSim.Region.ScriptEngine.Shared; | 38 | using OpenSim.Region.ScriptEngine.Shared; |
38 | using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; | 39 | using 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); |