aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorJeff Ames2009-06-10 04:28:56 +0000
committerJeff Ames2009-06-10 04:28:56 +0000
commita23d64dec1cbf88abc3c7e84664a683dee534e4a (patch)
tree7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentLetting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff)
downloadopensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index c8ed93c..2501752 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
206 // DO NOT THROW JUST THE INNER EXCEPTION! 206 // DO NOT THROW JUST THE INNER EXCEPTION!
207 // FriendlyErrors depends on getting the whole exception! 207 // FriendlyErrors depends on getting the whole exception!
208 // 208 //
209 if ( !(tie.InnerException is EventAbortException) ) 209 if (!(tie.InnerException is EventAbortException))
210 { 210 {
211 throw; 211 throw;
212 } 212 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
index 9cdffaa..d8f44c1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
@@ -1407,7 +1407,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
1407 throw new PrologException(Atom.a("instantiation_error"), 1407 throw new PrologException(Atom.a("instantiation_error"),
1408 "Arg 1 Char and arg 2 Code are both unbound variables"); 1408 "Arg 1 Char and arg 2 Code are both unbound variables");
1409 1409
1410 return YP.unify(Char, Atom.a(new String(new char[] {(char)codeInt} ))); 1410 return YP.unify(Char, Atom.a(new String(new char[] {(char)codeInt})));
1411 } 1411 }
1412 else 1412 else
1413 { 1413 {
@@ -2343,7 +2343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
2343 string results = ""; 2343 string results = "";
2344 for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) 2344 for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch())
2345 { 2345 {
2346 //m_log.Debug( m ); 2346 //m_log.Debug(m);
2347 results += presep+ m + postsep; 2347 results += presep+ m + postsep;
2348 } 2348 }
2349 return results; 2349 return results;