aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-26 02:51:00 +0000
committerMelanie Thielker2008-09-26 02:51:00 +0000
commitc21a8b99694e459408a9ccc43e525928038b2b22 (patch)
tree21190b513065cc7b1f3442d2cf2ed9ce1d2077f4 /OpenSim/Region/ScriptEngine/DotNetEngine
parentMantis#2265. Thank you kindly, Idb for a patch that: (diff)
downloadopensim-SC_OLD-c21a8b99694e459408a9ccc43e525928038b2b22.zip
opensim-SC_OLD-c21a8b99694e459408a9ccc43e525928038b2b22.tar.gz
opensim-SC_OLD-c21a8b99694e459408a9ccc43e525928038b2b22.tar.bz2
opensim-SC_OLD-c21a8b99694e459408a9ccc43e525928038b2b22.tar.xz
Full API convergence. Api is back in LSL_Api.cs and OSSL_Api.cs.
The binaries are still different, but that is only a small step away now. The OSSLPrim has been removed. This commit will breal all scripts using Prim.Scale(), etc, syntax. It was not secure and will have to be brought back in another form.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 624b20b..8ff3bfd 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -132,10 +132,16 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
132 // this private copy will contain Read-Only FullitemID so that it can bring that on to the server whenever needed. 132 // this private copy will contain Read-Only FullitemID so that it can bring that on to the server whenever needed.
133 133
134 134
135 BuilIn_Commands LSLB = new BuilIn_Commands(m_scriptEngine, m_host, localID, itemID); 135// OSSL_BuilIn_Commands LSLB = new OSSL_BuilIn_Commands(m_scriptEngine, m_host, localID, itemID);
136 LSL_Api LSL = new LSL_Api();
137 OSSL_Api OSSL = new OSSL_Api();
138
139 LSL.Initialize(m_scriptEngine, m_host, localID, itemID);
140 OSSL.Initialize(m_scriptEngine, m_host, localID, itemID);
136 141
137 // Start the script - giving it BuiltIns 142 // Start the script - giving it BuiltIns
138 CompiledScript.Start(LSLB); 143 CompiledScript.InitApi("LSL", LSL);
144 CompiledScript.InitApi("OSSL", OSSL);
139 145
140 // Fire the first start-event 146 // Fire the first start-event
141 int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); 147 int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID);