aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
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
parentLetting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff)
downloadopensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip
opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz
opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2
opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs4
4 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 40889ca..d812e48 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2856,7 +2856,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2856 2856
2857 if (m_TransferModule != null) 2857 if (m_TransferModule != null)
2858 { 2858 {
2859 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); 2859 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
2860 } 2860 }
2861 ScriptSleep(2000); 2861 ScriptSleep(2000);
2862 } 2862 }
@@ -3668,7 +3668,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3668 bucket); 3668 bucket);
3669 3669
3670 if (m_TransferModule != null) 3670 if (m_TransferModule != null)
3671 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); 3671 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
3672 } 3672 }
3673 else 3673 else
3674 { 3674 {
@@ -5968,7 +5968,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5968 bucket); 5968 bucket);
5969 5969
5970 if (m_TransferModule != null) 5970 if (m_TransferModule != null)
5971 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); 5971 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
5972 } 5972 }
5973 5973
5974 public void llSetVehicleType(int type) 5974 public void llSetVehicleType(int type)
@@ -6008,7 +6008,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6008 if (!m_host.ParentGroup.IsDeleted) 6008 if (!m_host.ParentGroup.IsDeleted)
6009 { 6009 {
6010 m_host.ParentGroup.RootPart.SetVehicleVectorParam(param, 6010 m_host.ParentGroup.RootPart.SetVehicleVectorParam(param,
6011 new PhysicsVector((float)vec.x, (float)vec.y, (float)vec.z) ); 6011 new PhysicsVector((float)vec.x, (float)vec.y, (float)vec.z));
6012 } 6012 }
6013 } 6013 }
6014 } 6014 }
@@ -7039,7 +7039,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7039 return (double)Math.Log(val); 7039 return (double)Math.Log(val);
7040 } 7040 }
7041 7041
7042 public LSL_List llGetAnimationList( string id ) 7042 public LSL_List llGetAnimationList(string id)
7043 { 7043 {
7044 m_host.AddScriptLPS(1); 7044 m_host.AddScriptLPS(1);
7045 7045
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7f3db9c..73c3e4c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -586,7 +586,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
586 586
587 // Check for hostname , attempt to make a hglink 587 // Check for hostname , attempt to make a hglink
588 // and convert the regionName to the target region 588 // and convert the regionName to the target region
589 if ( regionName.Contains(".") && regionName.Contains(":")) 589 if (regionName.Contains(".") && regionName.Contains(":"))
590 { 590 {
591 // Try to link the region 591 // Try to link the region
592 RegionInfo regInfo = HGHyperlink.TryLinkRegion(World, 592 RegionInfo regInfo = HGHyperlink.TryLinkRegion(World,
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;