diff options
author | Jeff Ames | 2008-10-05 14:15:39 +0000 |
---|---|---|
committer | Jeff Ames | 2008-10-05 14:15:39 +0000 |
commit | aab6cdd8b05a97c8906a67eb8d3233580fbebb2f (patch) | |
tree | 1020456338cb7cc0b5ce5769fc4c0d85bd47bfe8 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | * An update to the UDP Packet handler which might make the giant sized crater... (diff) | |
download | opensim-SC_OLD-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.zip opensim-SC_OLD-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.tar.gz opensim-SC_OLD-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.tar.bz2 opensim-SC_OLD-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | 26 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 10 |
2 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index 5c1c57a..90598c1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | |||
@@ -191,19 +191,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
191 | //Console.WriteLine("ScriptEngine: Executing function name: " + EventName); | 191 | //Console.WriteLine("ScriptEngine: Executing function name: " + EventName); |
192 | #endif | 192 | #endif |
193 | // Found | 193 | // Found |
194 | try | 194 | try |
195 | { | 195 | { |
196 | ev.Invoke(m_Script, args); | 196 | ev.Invoke(m_Script, args); |
197 | } | 197 | } |
198 | catch (TargetInvocationException tie) | 198 | catch (TargetInvocationException tie) |
199 | { | 199 | { |
200 | // Grab the inner exception and rethrow it | 200 | // Grab the inner exception and rethrow it |
201 | throw tie.InnerException; | 201 | throw tie.InnerException; |
202 | } | 202 | } |
203 | catch (Exception e) | 203 | catch (Exception e) |
204 | { | 204 | { |
205 | throw e; | 205 | throw e; |
206 | } | 206 | } |
207 | } | 207 | } |
208 | 208 | ||
209 | protected void initEventFlags() | 209 | protected void initEventFlags() |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index f3ca326..d92ae7f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -214,11 +214,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
214 | { | 214 | { |
215 | return m_OSSL_Functions.osGetScriptEngineName(); | 215 | return m_OSSL_Functions.osGetScriptEngineName(); |
216 | } | 216 | } |
217 | 217 | ||
218 | public string osGetSimulatorVersion() | 218 | public string osGetSimulatorVersion() |
219 | { | 219 | { |
220 | return m_OSSL_Functions.osGetSimulatorVersion(); | 220 | return m_OSSL_Functions.osGetSimulatorVersion(); |
221 | } | 221 | } |
222 | 222 | ||
223 | 223 | ||
224 | //for testing purposes only | 224 | //for testing purposes only |