aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs31
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs387
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs18
11 files changed, 68 insertions, 428 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 4b95e02..1d1d337 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -155,7 +155,7 @@ namespace OpenSim
155 } 155 }
156 156
157 // Load all script engines found 157 // Load all script engines found
158 //OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(); 158 OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log);
159 159
160 for (int i = 0; i < configFiles.Length; i++) 160 for (int i = 0; i < configFiles.Length; i++)
161 { 161 {
@@ -166,11 +166,11 @@ namespace OpenSim
166 UDPServer udpServer; 166 UDPServer udpServer;
167 Scene scene = SetupScene(regionInfo, out udpServer); 167 Scene scene = SetupScene(regionInfo, out udpServer);
168 168
169 169
170 //OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine"); 170 OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine");
171 //scene.AddScriptEngine(ScriptEngine); 171 scene.AddScriptEngine(ScriptEngine, m_log);
172 //// TODO: TEMP load default script 172 // TODO: TEMP load default script
173 //ScriptEngine.StartScript(Path.Combine("ScriptEngines", "default.lsl"), "TEST"); 173 ScriptEngine.StartScript(Path.Combine("ScriptEngines", "default.lsl"), "TEST");
174 174
175 175
176 m_localScenes.Add(scene); 176 m_localScenes.Add(scene);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5123048..4254f74 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1017,10 +1017,10 @@ namespace OpenSim.Region.Environment.Scenes
1017 1017
1018 #region Script Engine 1018 #region Script Engine
1019 private List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface> ScriptEngines = new List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface>(); 1019 private List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface> ScriptEngines = new List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface>();
1020 public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine) 1020 public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine, LogBase m_logger)
1021 { 1021 {
1022 ScriptEngines.Add(ScriptEngine); 1022 ScriptEngines.Add(ScriptEngine);
1023 ScriptEngine.InitializeEngine(this); 1023 ScriptEngine.InitializeEngine(this, m_logger);
1024 } 1024 }
1025 #endregion 1025 #endregion
1026 1026
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
index 5f378a6..510f257 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
34{ 34{
35 public interface ScriptEngineInterface 35 public interface ScriptEngineInterface
36 { 36 {
37 void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld); 37 void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger);
38 void Shutdown(); 38 void Shutdown();
39 void StartScript(string ScriptID, string ObjectID); 39 void StartScript(string ScriptID, string ObjectID);
40 } 40 }
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 4b912e4..2c87359 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -36,14 +36,25 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
36{ 36{
37 public class ScriptEngineLoader 37 public class ScriptEngineLoader
38 { 38 {
39 public ScriptEngineLoader() 39 private OpenSim.Framework.Console.LogBase m_log;
40 public ScriptEngineLoader(OpenSim.Framework.Console.LogBase logger)
40 { 41 {
42 m_log = logger;
41 } 43 }
42 44
43 public ScriptEngineInterface LoadScriptEngine(string EngineName) 45 public ScriptEngineInterface LoadScriptEngine(string EngineName)
44 { 46 {
45 return LoadAndInitAssembly(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"), 47 ScriptEngineInterface ret = null;
46 "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine"); 48 try
49 {
50 ret = LoadAndInitAssembly(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
51 "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
52 }
53 catch (Exception e)
54 {
55 m_log.Error("ScriptEngine", "Error loading assembly \"" + EngineName + "\": " + e.ToString());
56 }
57 return ret;
47 } 58 }
48 59
49 /// <summary> 60 /// <summary>
@@ -73,6 +84,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
73 //} 84 //}
74 //catch (Exception e) 85 //catch (Exception e)
75 //{ 86 //{
87 // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());
76 //} 88 //}
77 89
78 90
@@ -89,9 +101,20 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
89 //} 101 //}
90 //catch (Exception e) 102 //catch (Exception e)
91 //{ 103 //{
104 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
92 //} 105 //}
93 106
94 return (ScriptEngineInterface)Activator.CreateInstance(t); 107 ScriptEngineInterface ret;
108 //try
109 //{
110 ret = (ScriptEngineInterface)Activator.CreateInstance(t);
111 //}
112 //catch (Exception e)
113 //{
114 // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
115 //}
116
117 return ret;
95 118
96 119
97 } 120 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs
index 6df5b9f..49367f6 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs
@@ -35,6 +35,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
35 public static class Common 35 public static class Common
36 { 36 {
37 static public bool Debug = true; 37 static public bool Debug = true;
38 static public ScriptEngine mySE;
38 39
39 //public delegate void SendToDebugEventDelegate(string Message); 40 //public delegate void SendToDebugEventDelegate(string Message);
40 //public delegate void SendToLogEventDelegate(string Message); 41 //public delegate void SendToLogEventDelegate(string Message);
@@ -44,13 +45,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
44 static public void SendToDebug(string Message) 45 static public void SendToDebug(string Message)
45 { 46 {
46 //if (Debug == true) 47 //if (Debug == true)
47 Console.WriteLine("SE:Debug: " + Message); 48 mySE.m_logger.Verbose("ScriptEngine", "Debug: " + Message);
48 //SendToDebugEvent("\r\n" + DateTime.Now.ToString("[HH:mm:ss] ") + Message); 49 //SendToDebugEvent("\r\n" + DateTime.Now.ToString("[HH:mm:ss] ") + Message);
49 } 50 }
50 static public void SendToLog(string Message) 51 static public void SendToLog(string Message)
51 { 52 {
52 //if (Debug == true) 53 //if (Debug == true)
53 Console.WriteLine("SE:LOG: " + Message); 54 mySE.m_logger.Verbose("ScriptEngine", "LOG: " + Message);
54 //SendToLogEvent("\r\n" + DateTime.Now.ToString("[HH:mm:ss] ") + Message); 55 //SendToLogEvent("\r\n" + DateTime.Now.ToString("[HH:mm:ss] ") + Message);
55 } 56 }
56 } 57 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index 5fa25fb..f9908e4 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -13,7 +13,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
13 public void Start(OpenSim.Region.Environment.Scenes.Scene _World, string FullScriptID) 13 public void Start(OpenSim.Region.Environment.Scenes.Scene _World, string FullScriptID)
14 { 14 {
15 World = _World; 15 World = _World;
16 Common.SendToLog("OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass.Start() called. FullScriptID: " + FullScriptID); 16 Console.WriteLine("ScriptEngine", "LSL_BaseClass.Start() called. FullScriptID: " + FullScriptID);
17 17
18 return; 18 return;
19 } 19 }
@@ -49,14 +49,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
49 public void llWhisper(int channelID, string text) 49 public void llWhisper(int channelID, string text)
50 { 50 {
51 //Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");"); 51 //Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");");
52 Console.WriteLine("llWhisper Channel " + channelID + ", Text: \"" + text + "\""); 52 Console.WriteLine("ScriptEngine", "llWhisper Channel " + channelID + ", Text: \"" + text + "\"");
53 } 53 }
54 //public void llSay(UInt32 channelID, string text) 54 //public void llSay(UInt32 channelID, string text)
55 public void llSay(int channelID, string text) 55 public void llSay(int channelID, string text)
56 { 56 {
57 //TODO: DO SOMETHING USEFUL HERE 57 //TODO: DO SOMETHING USEFUL HERE
58 //Common.SendToDebug("INTERNAL FUNCTION llSay(" + (UInt32)channelID + ", \"" + (string)text + "\");"); 58 //Common.SendToDebug("INTERNAL FUNCTION llSay(" + (UInt32)channelID + ", \"" + (string)text + "\");");
59 Console.WriteLine("llSay Channel " + channelID + ", Text: \"" + text + "\""); 59 Console.WriteLine("ScriptEngine", "llSay Channel " + channelID + ", Text: \"" + text + "\"");
60 //World.SimChat( 60 //World.SimChat(
61 } 61 }
62 public void llShout(UInt16 channelID, string text) { return; } 62 public void llShout(UInt16 channelID, string text) { return; }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs
deleted file mode 100644
index 3a87fa9..0000000
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs
+++ /dev/null
@@ -1,387 +0,0 @@
1 /*
2* Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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/* Original code: Tedd Hansen */
29using System;
30using System.Collections.Generic;
31using System.Text;
32
33namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
34{
35 public class LSL_BuiltIn_Commands_TestImplementation //: LSL_BuiltIn_Commands_Interface
36 {
37 public LSL_BuiltIn_Commands_TestImplementation(string FullScriptID)
38 {
39 Common.SendToDebug("LSL_BuiltIn_Commands_TestImplementation: Creating object for FullScriptID: " + FullScriptID);
40 }
41
42
43 public float llSin(float f) { return 0; }
44 public float llCos(float f) { return 0; }
45 public float llTan(float f) { return 0; }
46 public float llAtan2(float x, float y) { return 0; }
47 public float llSqrt(float f) { return 0; }
48 public float llPow(float fbase, float fexponent) { return 0; }
49 public UInt32 llAbs(UInt32 i) { return 0; }
50 public float llFabs(float f) { return 0; }
51 public float llFrand(float mag) { return 0; }
52 public UInt32 llFloor(float f) { return 0; }
53 public UInt32 llCeil(float f) { return 0; }
54 public UInt32 llRound(float f) { return 0; }
55 public float llVecMag(Axiom.Math.Vector3 v) { return 0; }
56 public Axiom.Math.Vector3 llVecNorm(Axiom.Math.Vector3 v) { return new Axiom.Math.Vector3(); }
57 public float llVecDist(Axiom.Math.Vector3 a, Axiom.Math.Vector3 b) { return 0; }
58 public Axiom.Math.Vector3 llRot2Euler(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); }
59 public Axiom.Math.Quaternion llEuler2Rot(Axiom.Math.Vector3 v) { return new Axiom.Math.Quaternion(); }
60 public Axiom.Math.Quaternion llAxes2Rot(Axiom.Math.Vector3 fwd, Axiom.Math.Vector3 left, Axiom.Math.Vector3 up) { return new Axiom.Math.Quaternion(); }
61 public Axiom.Math.Vector3 llRot2Fwd(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); }
62 public Axiom.Math.Vector3 llRot2Left(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); }
63 public Axiom.Math.Vector3 llRot2Up(Axiom.Math.Quaternion r) { return new Axiom.Math.Vector3(); }
64 public Axiom.Math.Quaternion llRotBetween(Axiom.Math.Vector3 start, Axiom.Math.Vector3 end) { return new Axiom.Math.Quaternion(); }
65 public void llWhisper(UInt16 channelID, string text)
66 {
67 Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");");
68 Common.SendToLog("llWhisper Channel " + channelID + ", Text: \"" + text + "\"");
69 }
70 //public void llSay(UInt32 channelID, string text)
71 public void llSay(object channelID, object text)
72 {
73 //TODO: DO SOMETHING USEFUL HERE
74 Common.SendToDebug("INTERNAL FUNCTION llSay(" + (UInt32)channelID + ", \"" + (string)text + "\");");
75 Common.SendToLog("llSay Channel " + (UInt32)channelID + ", Text: \"" + (string)text + "\"");
76 }
77 public void llShout(UInt16 channelID, string text) { return; }
78 public UInt32 llListen(UInt16 channelID, string name, string ID, string msg) { return 0; }
79 public void llListenControl(UInt32 number, UInt32 active) { return; }
80 public void llListenRemove(UInt32 number) { return; }
81 public void llSensor(string name, string id, UInt32 type, float range, float arc) { return; }
82 public void llSensorRepeat(string name, string id, UInt32 type, float range, float arc, float rate) { return; }
83 public void llSensorRemove() { return; }
84 public string llDetectedName(UInt32 number) { return ""; }
85 public string llDetectedKey(UInt32 number) { return ""; }
86 public string llDetectedOwner(UInt32 number) { return ""; }
87 public UInt32 llDetectedType(UInt32 number) { return 0; }
88 public Axiom.Math.Vector3 llDetectedPos(UInt32 number) { return new Axiom.Math.Vector3(); }
89 public Axiom.Math.Vector3 llDetectedVel(UInt32 number) { return new Axiom.Math.Vector3(); }
90 public Axiom.Math.Vector3 llDetectedGrab(UInt32 number) { return new Axiom.Math.Vector3(); }
91 public Axiom.Math.Quaternion llDetectedRot(UInt32 number) { return new Axiom.Math.Quaternion(); }
92 public UInt32 llDetectedGroup(UInt32 number) { return 0; }
93 public UInt32 llDetectedLinkNumber(UInt32 number) { return 0; }
94 public void llDie() { return; }
95 public float llGround(Axiom.Math.Vector3 offset) { return 0; }
96 public float llCloud(Axiom.Math.Vector3 offset) { return 0; }
97 public Axiom.Math.Vector3 llWind(Axiom.Math.Vector3 offset) { return new Axiom.Math.Vector3(); }
98 public void llSetStatus(UInt32 status, UInt32 value) { return; }
99 public UInt32 llGetStatus(UInt32 status) { return 0; }
100 public void llSetScale(Axiom.Math.Vector3 scale) { return; }
101 public Axiom.Math.Vector3 llGetScale() { return new Axiom.Math.Vector3(); }
102 public void llSetColor(Axiom.Math.Vector3 color, UInt32 face) { return; }
103 public float llGetAlpha(UInt32 face) { return 0; }
104 public void llSetAlpha(float alpha, UInt32 face) { return; }
105 public Axiom.Math.Vector3 llGetColor(UInt32 face) { return new Axiom.Math.Vector3(); }
106 public void llSetTexture(string texture, UInt32 face) { return; }
107 public void llScaleTexture(float u, float v, UInt32 face) { return; }
108 public void llOffsetTexture(float u, float v, UInt32 face) { return; }
109 public void llRotateTexture(float rotation, UInt32 face) { return; }
110 public string llGetTexture(UInt32 face) { return ""; }
111 public void llSetPos(Axiom.Math.Vector3 pos) { return; }
112
113
114 public void llGetPos() { }
115 public void llGetLocalPos() { }
116 public void llSetRot() { }
117 public void llGetRot() { }
118 public void llGetLocalRot() { }
119 public void llSetForce() { }
120 public void llGetForce() { }
121 public void llTarget() { }
122 public void llTargetRemove() { }
123 public void llRotTarget() { }
124 public void llRotTargetRemove() { }
125 public void llMoveToTarget() { }
126 public void llStopMoveToTarget() { }
127 public void llApplyImpulse() { }
128 public void llApplyRotationalImpulse() { }
129 public void llSetTorque() { }
130 public void llGetTorque() { }
131 public void llSetForceAndTorque() { }
132 public void llGetVel() { }
133 public void llGetAccel() { }
134 public void llGetOmega() { }
135 public void llGetTimeOfDay() { }
136 public void llGetWallclock() { }
137 public void llGetTime() { }
138 public void llResetTime() { }
139 public void llGetAndResetTime() { }
140 public void llSound() { }
141 public void llPlaySound() { }
142 public void llLoopSound() { }
143 public void llLoopSoundMaster() { }
144 public void llLoopSoundSlave() { }
145 public void llPlaySoundSlave() { }
146 public void llTriggerSound() { }
147 public void llStopSound() { }
148 public void llPreloadSound() { }
149 public void llGetSubString() { }
150 public void llDeleteSubString() { }
151 public void llInsertString() { }
152 public void llToUpper() { }
153 public void llToLower() { }
154 public void llGiveMoney() { }
155 public void llMakeExplosion() { }
156 public void llMakeFountain() { }
157 public void llMakeSmoke() { }
158 public void llMakeFire() { }
159 public void llRezObject() { }
160 public void llLookAt() { }
161 public void llStopLookAt() { }
162 public void llSetTimerEvent() { }
163 public void llSleep() { }
164 public void llGetMass() { }
165 public void llCollisionFilter() { }
166 public void llTakeControls() { }
167 public void llReleaseControls() { }
168 public void llAttachToAvatar() { }
169 public void llDetachFromAvatar() { }
170 public void llTakeCamera() { }
171 public void llReleaseCamera() { }
172 public void llGetOwner() { }
173 public void llInstantMessage() { }
174 public void llEmail() { }
175 public void llGetNextEmail() { }
176 public void llGetKey() { }
177 public void llSetBuoyancy() { }
178 public void llSetHoverHeight() { }
179 public void llStopHover() { }
180 public void llMinEventDelay() { }
181 public void llSoundPreload() { }
182 public void llRotLookAt() { }
183 public void llStringLength() { }
184 public void llStartAnimation() { }
185 public void llStopAnimation() { }
186 public void llPointAt() { }
187 public void llStopPointAt() { }
188 public void llTargetOmega() { }
189 public void llGetStartParameter() { }
190 public void llGodLikeRezObject() { }
191 public void llRequestPermissions() { }
192 public void llGetPermissionsKey() { }
193 public void llGetPermissions() { }
194 public void llGetLinkNumber() { }
195 public void llSetLinkColor() { }
196 public void llCreateLink() { }
197 public void llBreakLink() { }
198 public void llBreakAllLinks() { }
199 public void llGetLinkKey() { }
200 public void llGetLinkName() { }
201 public void llGetInventoryNumber() { }
202 public void llGetInventoryName() { }
203 public void llSetScriptState() { }
204 public void llGetEnergy() { }
205 public void llGiveInventory() { }
206 public void llRemoveInventory() { }
207 public void llSetText() { }
208 public void llWater() { }
209 public void llPassTouches() { }
210 public void llRequestAgentData() { }
211 public void llRequestInventoryData() { }
212 public void llSetDamage() { }
213 public void llTeleportAgentHome() { }
214 public void llModifyLand() { }
215 public void llCollisionSound() { }
216 public void llCollisionSprite() { }
217 public void llGetAnimation() { }
218 public void llResetScript() { }
219 public void llMessageLinked() { }
220 public void llPushObject() { }
221 public void llPassCollisions() { }
222 public void llGetScriptName() { }
223 public void llGetNumberOfSides() { }
224 public void llAxisAngle2Rot() { }
225 public void llRot2Axis() { }
226 public void llRot2Angle() { }
227 public void llAcos() { }
228 public void llAsin() { }
229 public void llAngleBetween() { }
230 public void llGetInventoryKey() { }
231 public void llAllowInventoryDrop() { }
232 public void llGetSunDirection() { }
233 public void llGetTextureOffset() { }
234 public void llGetTextureScale() { }
235 public void llGetTextureRot() { }
236 public void llSubStringIndex() { }
237 public void llGetOwnerKey() { }
238 public void llGetCenterOfMass() { }
239 public void llListSort() { }
240 public void llGetListLength() { }
241 public void llList2Integer() { }
242 public void llList2Float() { }
243 public void llList2String() { }
244 public void llList2Key() { }
245 public void llList2Vector() { }
246 public void llList2Rot() { }
247 public void llList2List() { }
248 public void llDeleteSubList() { }
249 public void llGetListEntryType() { }
250 public void llList2CSV() { }
251 public void llCSV2List() { }
252 public void llListRandomize() { }
253 public void llList2ListStrided() { }
254 public void llGetRegionCorner() { }
255 public void llListInsertList() { }
256 public void llListFindList() { }
257 public void llGetObjectName() { }
258 public void llSetObjectName() { }
259 public void llGetDate() { }
260 public void llEdgeOfWorld() { }
261 public void llGetAgentInfo() { }
262 public void llAdjustSoundVolume() { }
263 public void llSetSoundQueueing() { }
264 public void llSetSoundRadius() { }
265 public void llKey2Name() { }
266 public void llSetTextureAnim() { }
267 public void llTriggerSoundLimited() { }
268 public void llEjectFromLand() { }
269 public void llParseString2List() { }
270 public void llOverMyLand() { }
271 public void llGetLandOwnerAt() { }
272 public void llGetNotecardLine() { }
273 public void llGetAgentSize() { }
274 public void llSameGroup() { }
275 public void llUnSit() { }
276 public void llGroundSlope() { }
277 public void llGroundNormal() { }
278 public void llGroundContour() { }
279 public void llGetAttached() { }
280 public void llGetFreeMemory() { }
281 public void llGetRegionName() { }
282 public void llGetRegionTimeDilation() { }
283 public void llGetRegionFPS() { }
284 public void llParticleSystem() { }
285 public void llGroundRepel() { }
286 public void llGiveInventoryList() { }
287 public void llSetVehicleType() { }
288 public void llSetVehicleFloatParam() { }
289 public void llSetVehicleVectorParam() { }
290 public void llSetVehicleRotationParam() { }
291 public void llSetVehicleFlags() { }
292 public void llRemoveVehicleFlags() { }
293 public void llSitTarget() { }
294 public void llAvatarOnSitTarget() { }
295 public void llAddToLandPassList() { }
296 public void llSetTouchText() { }
297 public void llSetSitText() { }
298 public void llSetCameraEyeOffset() { }
299 public void llSetCameraAtOffset() { }
300 public void llDumpList2String() { }
301 public void llScriptDanger() { }
302 public void llDialog() { }
303 public void llVolumeDetect() { }
304 public void llResetOtherScript() { }
305 public void llGetScriptState() { }
306 public void llRemoteLoadScript() { }
307 public void llSetRemoteScriptAccessPin() { }
308 public void llRemoteLoadScriptPin() { }
309 public void llOpenRemoteDataChannel() { }
310 public void llSendRemoteData() { }
311 public void llRemoteDataReply() { }
312 public void llCloseRemoteDataChannel() { }
313 public void llMD5String() { }
314 public void llSetPrimitiveParams() { }
315 public void llStringToBase64() { }
316 public void llBase64ToString() { }
317 public void llXorBase64Strings() { }
318 public void llRemoteDataSetRegion() { }
319 public void llLog10() { }
320 public void llLog() { }
321 public void llGetAnimationList() { }
322 public void llSetParcelMusicURL() { }
323 public void llGetRootPosition() { }
324 public void llGetRootRotation() { }
325 public void llGetObjectDesc() { }
326 public void llSetObjectDesc() { }
327 public void llGetCreator() { }
328 public void llGetTimestamp() { }
329 public void llSetLinkAlpha() { }
330 public void llGetNumberOfPrims() { }
331 public void llGetNumberOfNotecardLines() { }
332 public void llGetBoundingBox() { }
333 public void llGetGeometricCenter() { }
334 public void llGetPrimitiveParams() { }
335 public void llIntegerToBase64() { }
336 public void llBase64ToInteger() { }
337 public void llGetGMTclock() { }
338 public void llGetSimulatorHostname() { }
339 public void llSetLocalRot() { }
340 public void llParseStringKeepNulls() { }
341 public void llRezAtRoot() { }
342 public void llGetObjectPermMask() { }
343 public void llSetObjectPermMask() { }
344 public void llGetInventoryPermMask() { }
345 public void llSetInventoryPermMask() { }
346 public void llGetInventoryCreator() { }
347 public void llOwnerSay() { }
348 public void llRequestSimulatorData() { }
349 public void llForceMouselook() { }
350 public void llGetObjectMass() { }
351 public void llListReplaceList() { }
352 public void llLoadURL() { }
353 public void llParcelMediaCommandList() { }
354 public void llParcelMediaQuery() { }
355 public void llModPow() { }
356 public void llGetInventoryType() { }
357 public void llSetPayPrice() { }
358 public void llGetCameraPos() { }
359 public void llGetCameraRot() { }
360 public void llSetPrimURL() { }
361 public void llRefreshPrimURL() { }
362 public void llEscapeURL() { }
363 public void llUnescapeURL() { }
364 public void llMapDestination() { }
365 public void llAddToLandBanList() { }
366 public void llRemoveFromLandPassList() { }
367 public void llRemoveFromLandBanList() { }
368 public void llSetCameraParams() { }
369 public void llClearCameraParams() { }
370 public void llListStatistics() { }
371 public void llGetUnixTime() { }
372 public void llGetParcelFlags() { }
373 public void llGetRegionFlags() { }
374 public void llXorBase64StringsCorrect() { }
375 public void llHTTPRequest() { }
376 public void llResetLandBanList() { }
377 public void llResetLandPassList() { }
378 public void llGetParcelPrimCount() { }
379 public void llGetParcelPrimOwners() { }
380 public void llGetObjectPrimCount() { }
381 public void llGetParcelMaxPrims() { }
382 public void llGetParcelDetails() { }
383
384
385
386 }
387}
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index 7ad00d1..25db231 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -44,12 +44,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
44 { 44 {
45 myScriptEngine = _ScriptEngine; 45 myScriptEngine = _ScriptEngine;
46 // TODO: HOOK EVENTS UP TO SERVER! 46 // TODO: HOOK EVENTS UP TO SERVER!
47 Common.SendToDebug("EventManager Start"); 47 myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Start");
48
49 // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager 48 // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager
50 49
51 // Hook up a test event to our test form 50 // Hook up a test event to our test form
52 Common.SendToDebug("EventManager Hooking up dummy-event: touch_start"); 51 myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Hooking up dummy-event: touch_start");
53 // TODO: REPLACE THIS WITH A REAL TOUCH_START EVENT IN SERVER 52 // TODO: REPLACE THIS WITH A REAL TOUCH_START EVENT IN SERVER
54 myScriptEngine.World.EventManager.OnObjectGrab += new OpenSim.Region.Environment.Scenes.EventManager.ObjectGrabDelegate(touch_start); 53 myScriptEngine.World.EventManager.OnObjectGrab += new OpenSim.Region.Environment.Scenes.EventManager.ObjectGrabDelegate(touch_start);
55 //myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start); 54 //myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start);
@@ -58,7 +57,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
58 public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) 57 public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
59 { 58 {
60 // Add to queue for all scripts in ObjectID object 59 // Add to queue for all scripts in ObjectID object
61 Common.SendToDebug("EventManager Event: touch_start"); 60 myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Event: touch_start");
62 myScriptEngine.myEventQueueManager.AddToObjectQueue("TEST", "touch_start", new object[] { (int)0 }); 61 myScriptEngine.myEventQueueManager.AddToObjectQueue("TEST", "touch_start", new object[] { (int)0 });
63 } 62 }
64 63
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 59f669b..0d8c160 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
51 public EventQueueManager(ScriptEngine _ScriptEngine) 51 public EventQueueManager(ScriptEngine _ScriptEngine)
52 { 52 {
53 myScriptEngine = _ScriptEngine; 53 myScriptEngine = _ScriptEngine;
54 Common.SendToDebug("EventQueueManager Start"); 54 myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Start");
55 // Start worker thread 55 // Start worker thread
56 EventQueueThread = new Thread(EventQueueThreadLoop); 56 EventQueueThread = new Thread(EventQueueThreadLoop);
57 EventQueueThread.IsBackground = true; 57 EventQueueThread.IsBackground = true;
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
70 } 70 }
71 catch (Exception e) 71 catch (Exception e)
72 { 72 {
73 Common.SendToDebug("EventQueueManager Exception killing worker thread: " + e.ToString()); 73 myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Exception killing worker thread: " + e.ToString());
74 } 74 }
75 } 75 }
76 // Todo: Clean up our queues 76 // Todo: Clean up our queues
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
79 79
80 private void EventQueueThreadLoop() 80 private void EventQueueThreadLoop()
81 { 81 {
82 Common.SendToDebug("EventQueueManager Worker thread spawned"); 82 myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Worker thread spawned");
83 try 83 try
84 { 84 {
85 while (true) 85 while (true)
@@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
93 { 93 {
94 // Something in queue, process 94 // Something in queue, process
95 QueueItemStruct QIS = EventQueue.Dequeue(); 95 QueueItemStruct QIS = EventQueue.Dequeue();
96 Common.SendToDebug("Processing event for ObjectID: " + QIS.ObjectID + ", ScriptID: " + QIS.ScriptID + ", FunctionName: " + QIS.FunctionName); 96 myScriptEngine.m_logger.Verbose("ScriptEngine", "Processing event for ObjectID: " + QIS.ObjectID + ", ScriptID: " + QIS.ScriptID + ", FunctionName: " + QIS.FunctionName);
97 // TODO: Execute function 97 // TODO: Execute function
98 myScriptEngine.myScriptManager.ExecuteFunction(QIS.ObjectID, QIS.ScriptID, QIS.FunctionName, QIS.param); 98 myScriptEngine.myScriptManager.ExecuteFunction(QIS.ObjectID, QIS.ScriptID, QIS.FunctionName, QIS.param);
99 } 99 }
@@ -101,14 +101,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
101 } 101 }
102 catch (ThreadAbortException tae) 102 catch (ThreadAbortException tae)
103 { 103 {
104 Common.SendToDebug("EventQueueManager Worker thread killed: " + tae.Message); 104 myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Worker thread killed: " + tae.Message);
105 } 105 }
106 } 106 }
107 107
108 public void AddToObjectQueue(string ObjectID, string FunctionName, object[] param) 108 public void AddToObjectQueue(string ObjectID, string FunctionName, object[] param)
109 { 109 {
110 // Determine all scripts in Object and add to their queue 110 // Determine all scripts in Object and add to their queue
111 Common.SendToDebug("EventQueueManager Adding ObjectID: " + ObjectID + ", FunctionName: " + FunctionName); 111 myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Adding ObjectID: " + ObjectID + ", FunctionName: " + FunctionName);
112 112
113 foreach (string ScriptID in myScriptEngine.myScriptManager.GetScriptKeys(ObjectID)) 113 foreach (string ScriptID in myScriptEngine.myScriptManager.GetScriptKeys(ObjectID))
114 { 114 {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 4a09cf3..bcfc06d 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -42,16 +42,20 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
42 internal EventManager myEventManager; // Handles and queues incoming events from OpenSim 42 internal EventManager myEventManager; // Handles and queues incoming events from OpenSim
43 internal EventQueueManager myEventQueueManager; // Executes events 43 internal EventQueueManager myEventQueueManager; // Executes events
44 internal ScriptManager myScriptManager; // Load, unload and execute scripts 44 internal ScriptManager myScriptManager; // Load, unload and execute scripts
45 internal OpenSim.Framework.Console.LogBase m_logger;
45 46
46 public ScriptEngine() 47 public ScriptEngine()
47 { 48 {
48 Common.SendToDebug("ScriptEngine Object Initialized"); 49 //Common.SendToDebug("ScriptEngine Object Initialized");
50 Common.mySE = this;
49 } 51 }
50 52
51 public void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld) 53 public void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger)
52 { 54 {
53 World = Sceneworld; 55 World = Sceneworld;
54 Common.SendToDebug("ScriptEngine InitializeEngine()"); 56 m_logger = logger;
57
58 m_logger.Status("ScriptEngine", "InitializeEngine");
55 59
56 // Create all objects we'll be using 60 // Create all objects we'll be using
57 myEventQueueManager = new EventQueueManager(this); 61 myEventQueueManager = new EventQueueManager(this);
@@ -71,7 +75,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
71 [Obsolete("!!!FOR DEBUGGING ONLY!!!")] 75 [Obsolete("!!!FOR DEBUGGING ONLY!!!")]
72 public void StartScript(string ScriptID, string ObjectID) 76 public void StartScript(string ScriptID, string ObjectID)
73 { 77 {
74 Common.SendToDebug("ScriptEngine DEBUG: StartScript: " + ScriptID); 78 m_logger.Status("ScriptEngine", "DEBUG: StartScript: " + ScriptID);
75 myScriptManager.StartScript(ScriptID, ObjectID); 79 myScriptManager.StartScript(ScriptID, ObjectID);
76 } 80 }
77 } 81 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 0c5bfc2..0c4adc1 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
41 public ScriptManager(ScriptEngine _ScriptEngine) 41 public ScriptManager(ScriptEngine _ScriptEngine)
42 { 42 {
43 myScriptEngine = _ScriptEngine; 43 myScriptEngine = _ScriptEngine;
44 Common.SendToDebug("ScriptManager Start"); 44 myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Start");
45 } 45 }
46 46
47 47
@@ -102,7 +102,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
102 /// <param name="ObjectID"></param> 102 /// <param name="ObjectID"></param>
103 public void StartScript(string ScriptID, string ObjectID) 103 public void StartScript(string ScriptID, string ObjectID)
104 { 104 {
105 Common.SendToDebug("ScriptManager StartScript: ScriptID: " + ScriptID + ", ObjectID: " + ObjectID); 105 myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager StartScript: ScriptID: " + ScriptID + ", ObjectID: " + ObjectID);
106 106
107 // We will initialize and start the script. 107 // We will initialize and start the script.
108 // It will be up to the script itself to hook up the correct events. 108 // It will be up to the script itself to hook up the correct events.
@@ -114,13 +114,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
114 FileName = ScriptID; 114 FileName = ScriptID;
115 115
116 // * Does script need compile? Send it to LSL compiler first. (TODO: Use (and clean) compiler cache) 116 // * Does script need compile? Send it to LSL compiler first. (TODO: Use (and clean) compiler cache)
117 Common.SendToDebug("ScriptManager Script extension: " + System.IO.Path.GetExtension(FileName).ToLower()); 117 myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Script extension: " + System.IO.Path.GetExtension(FileName).ToLower());
118 switch (System.IO.Path.GetExtension(FileName).ToLower()) 118 switch (System.IO.Path.GetExtension(FileName).ToLower())
119 { 119 {
120 case ".txt": 120 case ".txt":
121 case ".lsl": 121 case ".lsl":
122 case ".cs": 122 case ".cs":
123 Common.SendToDebug("ScriptManager Script is CS/LSL, compiling to .Net Assembly"); 123 myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Script is CS/LSL, compiling to .Net Assembly");
124 // Create a new instance of the compiler (currently we don't want reuse) 124 // Create a new instance of the compiler (currently we don't want reuse)
125 OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.Compiler LSLCompiler = new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.Compiler(); 125 OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.Compiler LSLCompiler = new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.Compiler();
126 // Compile 126 // Compile
@@ -130,7 +130,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
130 throw new Exception("Unknown script type."); 130 throw new Exception("Unknown script type.");
131 } 131 }
132 132
133 Common.SendToDebug("Compilation done"); 133 myScriptEngine.m_logger.Verbose("ScriptEngine", "Compilation done");
134 // * Insert yield into code 134 // * Insert yield into code
135 FileName = ProcessYield(FileName); 135 FileName = ProcessYield(FileName);
136 136
@@ -149,7 +149,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
149 //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL_BuiltIn_Commands_Interface LSLB = new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL_BuiltIn_Commands_TestImplementation(FullScriptID); 149 //OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL_BuiltIn_Commands_Interface LSLB = new OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL_BuiltIn_Commands_TestImplementation(FullScriptID);
150 150
151 // Start the script - giving it BuiltIns 151 // Start the script - giving it BuiltIns
152 Common.SendToDebug("ScriptManager initializing script, handing over private builtin command interface"); 152 myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager initializing script, handing over private builtin command interface");
153 Script.Start(myScriptEngine.World, ScriptID); 153 Script.Start(myScriptEngine.World, ScriptID);
154 154
155 155
@@ -174,7 +174,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
174 /// <returns></returns> 174 /// <returns></returns>
175 private OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass LoadAndInitAssembly(AppDomain FreeAppDomain, string FileName) 175 private OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass LoadAndInitAssembly(AppDomain FreeAppDomain, string FileName)
176 { 176 {
177 Common.SendToDebug("ScriptManager Loading Assembly " + FileName); 177 myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Loading Assembly " + FileName);
178 // Load .Net Assembly (.dll) 178 // Load .Net Assembly (.dll)
179 // Initialize and return it 179 // Initialize and return it
180 180
@@ -218,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
218 218
219 internal void ExecuteFunction(string ObjectID, string ScriptID, string FunctionName, object[] args) 219 internal void ExecuteFunction(string ObjectID, string ScriptID, string FunctionName, object[] args)
220 { 220 {
221 Common.SendToDebug("Executing Function ObjectID: " + ObjectID + ", ScriptID: " + ScriptID + ", FunctionName: " + FunctionName); 221 myScriptEngine.m_logger.Verbose("ScriptEngine", "Executing Function ObjectID: " + ObjectID + ", ScriptID: " + ScriptID + ", FunctionName: " + FunctionName);
222 OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass Script = myScriptEngine.myScriptManager.GetScript(ObjectID, ScriptID); 222 OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass Script = myScriptEngine.myScriptManager.GetScript(ObjectID, ScriptID);
223 223
224 Type type = Script.GetType(); 224 Type type = Script.GetType();
@@ -226,7 +226,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
226 226
227 //System.Collections.Generic.List<string> Functions = (System.Collections.Generic.List<string>) 227 //System.Collections.Generic.List<string> Functions = (System.Collections.Generic.List<string>)
228 //Type type = typeof(OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass); 228 //Type type = typeof(OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSO.LSL_BaseClass);
229 Common.SendToDebug("Invoke: \"" + Script.State + "_event_" + FunctionName + "\""); 229 myScriptEngine.m_logger.Verbose("ScriptEngine", "Invoke: \"" + Script.State + "_event_" + FunctionName + "\"");
230 type.InvokeMember(Script.State + "_event_" + FunctionName, BindingFlags.InvokeMethod, null, Script, args); 230 type.InvokeMember(Script.State + "_event_" + FunctionName, BindingFlags.InvokeMethod, null, Script, args);
231 //System.Collections.Generic.List<string> Functions = (System.Collections.Generic.List<string>)type.InvokeMember("GetFunctions", BindingFlags.InvokeMethod, null, Script, null); 231 //System.Collections.Generic.List<string> Functions = (System.Collections.Generic.List<string>)type.InvokeMember("GetFunctions", BindingFlags.InvokeMethod, null, Script, null);
232 232
generated by cgit v1.1 at 2024-11-05 18:46:18 +0000