aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorJeff Ames2008-10-05 14:15:39 +0000
committerJeff Ames2008-10-05 14:15:39 +0000
commitaab6cdd8b05a97c8906a67eb8d3233580fbebb2f (patch)
tree1020456338cb7cc0b5ce5769fc4c0d85bd47bfe8 /OpenSim/Region/ScriptEngine/Shared
parent* An update to the UDP Packet handler which might make the giant sized crater... (diff)
downloadopensim-SC-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.zip
opensim-SC-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.tar.gz
opensim-SC-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.tar.bz2
opensim-SC-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs26
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs10
5 files changed, 27 insertions, 27 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 655d85c..fffc331 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4699,7 +4699,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4699 if (cindex > 0) 4699 if (cindex > 0)
4700 { 4700 {
4701 ret.Add(str.Substring(0, cindex)); 4701 ret.Add(str.Substring(0, cindex));
4702 } 4702 }
4703 // Cannot use spacers.Contains() because spacers may be either type String or LSLString 4703 // Cannot use spacers.Contains() because spacers may be either type String or LSLString
4704 for (int j = 0; j < spacers.Length; j++) 4704 for (int j = 0; j < spacers.Length; j++)
4705 { 4705 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index bfe289c..ee95342 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -710,18 +710,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
710 return String.Empty; 710 return String.Empty;
711 } 711 }
712 } 712 }
713 713
714 public string osGetSimulatorVersion() 714 public string osGetSimulatorVersion()
715 { 715 {
716 // High because it can be used to target attacks to known weaknesses 716 // High because it can be used to target attacks to known weaknesses
717 // This would allow a new class of griefer scripts that don't even 717 // This would allow a new class of griefer scripts that don't even
718 // require their user to know what they are doing (see script 718 // require their user to know what they are doing (see script
719 // kiddie) 719 // kiddie)
720 // 720 //
721 CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion"); 721 CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion");
722 m_host.AddScriptLPS(1); 722 m_host.AddScriptLPS(1);
723 return m_ScriptEngine.World.GetSimulatorVersion(); 723 return m_ScriptEngine.World.GetSimulatorVersion();
724 } 724 }
725 725
726 726
727 //for testing purposes only 727 //for testing purposes only
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 48eddd2..92b77a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
85 void osSetRegionWaterHeight(double height); 85 void osSetRegionWaterHeight(double height);
86 86
87 string osGetScriptEngineName(); 87 string osGetScriptEngineName();
88 string osGetSimulatorVersion(); 88 string osGetSimulatorVersion();
89 void osSetParcelMediaTime(double time); 89 void osSetParcelMediaTime(double time);
90 Hashtable osParseJSON(string JSON); 90 Hashtable osParseJSON(string JSON);
91 91
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