aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-08-07 19:50:47 +0100
committerMelanie2009-08-07 19:50:47 +0100
commit178b40971a401307a827bc95abbe8d9d69566825 (patch)
treec14aaca5908f2d529765c64beba6d6b05ea5104f /OpenSim
parentFrom: Snowcrash <Snowcrash.short@gmail.com> (diff)
downloadopensim-SC_OLD-178b40971a401307a827bc95abbe8d9d69566825.zip
opensim-SC_OLD-178b40971a401307a827bc95abbe8d9d69566825.tar.gz
opensim-SC_OLD-178b40971a401307a827bc95abbe8d9d69566825.tar.bz2
opensim-SC_OLD-178b40971a401307a827bc95abbe8d9d69566825.tar.xz
Add a method to init the OSSL Api's m_LSL_Api member back to the OSSL Api
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Util.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs10
2 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 65d4f4d..003c543 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1155,7 +1155,10 @@ namespace OpenSim.Framework
1155 1155
1156 string[] files = Directory.GetFiles(p, c); 1156 string[] files = Directory.GetFiles(p, c);
1157 foreach (string f in files) 1157 foreach (string f in files)
1158 {
1159 m_log.InfoFormat("Adding file {0} to include list", f);
1158 found.Add(f); 1160 found.Add(f);
1161 }
1159 } 1162 }
1160 paths = addpaths; 1163 paths = addpaths;
1161 } 1164 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7c878b8..967b835 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
105 public class OSSL_Api : MarshalByRefObject, IOSSL_Api, IScriptApi 105 public class OSSL_Api : MarshalByRefObject, IOSSL_Api, IScriptApi
106 { 106 {
107 internal IScriptEngine m_ScriptEngine; 107 internal IScriptEngine m_ScriptEngine;
108 internal ILSL_Api m_LSL_Api; // get a reference to the LSL API so we can call methods housed there 108 internal ILSL_Api m_LSL_Api = null; // get a reference to the LSL API so we can call methods housed there
109 internal SceneObjectPart m_host; 109 internal SceneObjectPart m_host;
110 internal uint m_localID; 110 internal uint m_localID;
111 internal UUID m_itemID; 111 internal UUID m_itemID;
@@ -183,6 +183,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
183 throw new Exception("OSSL Runtime Error: " + msg); 183 throw new Exception("OSSL Runtime Error: " + msg);
184 } 184 }
185 185
186 private void InitLSL()
187 {
188 if (m_LSL_Api != null)
189 return;
190
191 m_LSL_Api = (ILSL_Api)m_ScriptEngine.GetApi(m_itemID, "LSL");
192 }
193
186 // 194 //
187 //Dumps an error message on the debug console. 195 //Dumps an error message on the debug console.
188 // 196 //