diff options
author | Jeff Ames | 2009-06-10 04:28:56 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-10 04:28:56 +0000 |
commit | a23d64dec1cbf88abc3c7e84664a683dee534e4a (patch) | |
tree | 7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Region/ScriptEngine/Shared | |
parent | Letting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff) | |
download | opensim-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 '')
8 files changed, 18 insertions, 18 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; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs index 91747af..41ecfd3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | |||
@@ -676,20 +676,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
676 | 676 | ||
677 | // It's possible that we don't have an assignment, in which case | 677 | // It's possible that we don't have an assignment, in which case |
678 | // the child will be null and we only print the semicolon. | 678 | // the child will be null and we only print the semicolon. |
679 | // for ( x = 0 ; x < 10 ; x++ ) | 679 | // for (x = 0; x < 10; x++) |
680 | // ^^^^^^^ | 680 | // ^^^^^ |
681 | ForLoopStatement s = (ForLoopStatement) fl.kids.Pop(); | 681 | ForLoopStatement s = (ForLoopStatement) fl.kids.Pop(); |
682 | if (null != s) | 682 | if (null != s) |
683 | { | 683 | { |
684 | retstr += GenerateForLoopStatement(s); | 684 | retstr += GenerateForLoopStatement(s); |
685 | } | 685 | } |
686 | retstr += Generate("; "); | 686 | retstr += Generate("; "); |
687 | // for ( x = 0 ; x < 10 ; x++ ) | 687 | // for (x = 0; x < 10; x++) |
688 | // ^^^^^^^^ | 688 | // ^^^^^^ |
689 | retstr += GenerateNode((SYMBOL) fl.kids.Pop()); | 689 | retstr += GenerateNode((SYMBOL) fl.kids.Pop()); |
690 | retstr += Generate("; "); | 690 | retstr += Generate("; "); |
691 | // for ( x = 0 ; x < 10 ; x++ ) | 691 | // for (x = 0; x < 10; x++) |
692 | // ^^^^^ | 692 | // ^^^ |
693 | retstr += GenerateForLoopStatement((ForLoopStatement) fl.kids.Pop()); | 693 | retstr += GenerateForLoopStatement((ForLoopStatement) fl.kids.Pop()); |
694 | retstr += GenerateLine(")"); | 694 | retstr += GenerateLine(")"); |
695 | 695 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 5c7ce43..a1525b9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -573,7 +573,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
573 | display--; | 573 | display--; |
574 | 574 | ||
575 | string severity = "Error"; | 575 | string severity = "Error"; |
576 | if ( CompErr.IsWarning ) | 576 | if (CompErr.IsWarning) |
577 | { | 577 | { |
578 | severity = "Warning"; | 578 | severity = "Warning"; |
579 | } | 579 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs index cacb8be..e77b3d2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs | |||
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
95 | // It's possible that a child is null, for instance when the | 95 | // It's possible that a child is null, for instance when the |
96 | // assignment part in a for-loop is left out, ie: | 96 | // assignment part in a for-loop is left out, ie: |
97 | // | 97 | // |
98 | // for ( ; i < 10; i++) | 98 | // for (; i < 10; i++) |
99 | // { | 99 | // { |
100 | // ... | 100 | // ... |
101 | // } | 101 | // } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index a641605..bdacf8b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | |||
@@ -447,7 +447,7 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
447 | // down-cast from Object to the correct type. | 447 | // down-cast from Object to the correct type. |
448 | // Note: no checks for item index being valid are performed | 448 | // Note: no checks for item index being valid are performed |
449 | 449 | ||
450 | public LSL_Types.LSLFloat GetLSLFloatItem( int itemIndex ) | 450 | public LSL_Types.LSLFloat GetLSLFloatItem(int itemIndex) |
451 | { | 451 | { |
452 | if (m_data[itemIndex] is LSL_Types.LSLInteger) | 452 | if (m_data[itemIndex] is LSL_Types.LSLInteger) |
453 | { | 453 | { |