diff options
author | Jeff Ames | 2008-05-16 01:22:11 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-16 01:22:11 +0000 |
commit | 65c5efe43b68700bad94076d4cd421160203c5de (patch) | |
tree | 589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Grid/ScriptEngine | |
parent | Thank you very much, mjm for : (diff) | |
download | opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.zip opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2 opensim-SC-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Grid/ScriptEngine')
8 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs index 3d06232..d18822c 100644 --- a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Runtime.InteropServices; | 29 | using System.Runtime.InteropServices; |
30 | 30 | ||
31 | // General Information about an assembly is controlled through the following | 31 | // General information about an assembly is controlled through the following |
32 | // set of attributes. Change these attribute values to modify the information | 32 | // set of attributes. Change these attribute values to modify the information |
33 | // associated with an assembly. | 33 | // associated with an assembly. |
34 | 34 | ||
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices; | |||
41 | [assembly : AssemblyTrademark("")] | 41 | [assembly : AssemblyTrademark("")] |
42 | [assembly : AssemblyCulture("")] | 42 | [assembly : AssemblyCulture("")] |
43 | 43 | ||
44 | // Setting ComVisible to false makes the types in this assembly not visible | 44 | // Setting ComVisible to false makes the types in this assembly not visible |
45 | // to COM components. If you need to access a type in this assembly from | 45 | // to COM components. If you need to access a type in this assembly from |
46 | // COM, set the ComVisible attribute to true on that type. | 46 | // COM, set the ComVisible attribute to true on that type. |
47 | 47 | ||
48 | [assembly : ComVisible(false)] | 48 | [assembly : ComVisible(false)] |
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices; | |||
54 | // Version information for an assembly consists of the following four values: | 54 | // Version information for an assembly consists of the following four values: |
55 | // | 55 | // |
56 | // Major Version | 56 | // Major Version |
57 | // Minor Version | 57 | // Minor Version |
58 | // Build Number | 58 | // Build Number |
59 | // Revision | 59 | // Revision |
60 | // | 60 | // |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index 072c86c..639cd54 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | |||
@@ -165,7 +165,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL | |||
165 | // if level == 0, add to return | 165 | // if level == 0, add to return |
166 | if (ilevel == 1 && lastlevel == 0) | 166 | if (ilevel == 1 && lastlevel == 0) |
167 | { | 167 | { |
168 | // 0 => 1: Get last | 168 | // 0 => 1: Get last |
169 | Match m = | 169 | Match m = |
170 | Regex.Match(cache, @"(?![a-zA-Z_]+)\s*([a-zA-Z_]+)[^a-zA-Z_\(\)]*{", | 170 | Regex.Match(cache, @"(?![a-zA-Z_]+)\s*([a-zA-Z_]+)[^a-zA-Z_\(\)]*{", |
171 | RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); | 171 | RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs index f957d63..60f4d42 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | |||
@@ -98,9 +98,9 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL | |||
98 | ads.ConfigurationFile | 98 | ads.ConfigurationFile |
99 | ); | 99 | ); |
100 | 100 | ||
101 | // Display the name of the calling AppDomain and the name | 101 | // Display the name of the calling AppDomain and the name |
102 | // of the second domain. | 102 | // of the second domain. |
103 | // NOTE: The application's thread has transitioned between | 103 | // NOTE: The application's thread has transitioned between |
104 | // AppDomains. | 104 | // AppDomains. |
105 | Console.WriteLine("Calling to '{0}'.", | 105 | Console.WriteLine("Calling to '{0}'.", |
106 | Thread.GetDomain().FriendlyName | 106 | Thread.GetDomain().FriendlyName |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs index 4ec8618..f7c8fb1 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs | |||
@@ -167,7 +167,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO | |||
167 | Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); | 167 | Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); |
168 | //ConstructorBuilder constructor = typeBuilder.DefineConstructor( | 168 | //ConstructorBuilder constructor = typeBuilder.DefineConstructor( |
169 | // MethodAttributes.Public, | 169 | // MethodAttributes.Public, |
170 | // CallingConventions.Standard, | 170 | // CallingConventions.Standard, |
171 | // new Type[0]); | 171 | // new Type[0]); |
172 | ConstructorBuilder constructor = typeBuilder.DefineConstructor( | 172 | ConstructorBuilder constructor = typeBuilder.DefineConstructor( |
173 | MethodAttributes.Public | | 173 | MethodAttributes.Public | |
@@ -191,8 +191,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO | |||
191 | //// Create state object | 191 | //// Create state object |
192 | //FieldName = "State"; | 192 | //FieldName = "State"; |
193 | //FieldBuilder State_fb = typeBuilder.DefineField( | 193 | //FieldBuilder State_fb = typeBuilder.DefineField( |
194 | // FieldName, | 194 | // FieldName, |
195 | // typeof(UInt32), | 195 | // typeof(UInt32), |
196 | // FieldAttributes.Public); | 196 | // FieldAttributes.Public); |
197 | //il.Emit(OpCodes.Ldarg_0); | 197 | //il.Emit(OpCodes.Ldarg_0); |
198 | //il.Emit(OpCodes.Ldc_I4, 0); | 198 | //il.Emit(OpCodes.Ldc_I4, 0); |
@@ -205,8 +205,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO | |||
205 | 205 | ||
206 | //FieldName = "LSL_BuiltIns"; | 206 | //FieldName = "LSL_BuiltIns"; |
207 | //FieldBuilder LSL_BuiltIns_fb = typeBuilder.DefineField( | 207 | //FieldBuilder LSL_BuiltIns_fb = typeBuilder.DefineField( |
208 | // FieldName, | 208 | // FieldName, |
209 | // objType1, | 209 | // objType1, |
210 | // FieldAttributes.Public); | 210 | // FieldAttributes.Public); |
211 | 211 | ||
212 | ////LSL_BuiltIn_Commands_TestImplementation _ti = new LSL_BuiltIn_Commands_TestImplementation(); | 212 | ////LSL_BuiltIn_Commands_TestImplementation _ti = new LSL_BuiltIn_Commands_TestImplementation(); |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs index 05f7611..11b567e 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs | |||
@@ -36,9 +36,9 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO | |||
36 | * | 36 | * |
37 | * These are internal "assembly" commands, | 37 | * These are internal "assembly" commands, |
38 | * basic operators like "ADD", "PUSH" and "POP" | 38 | * basic operators like "ADD", "PUSH" and "POP" |
39 | * | 39 | * |
40 | * It also contains managed stack and keeps track of internal variables, etc. | 40 | * It also contains managed stack and keeps track of internal variables, etc. |
41 | * | 41 | * |
42 | */ | 42 | */ |
43 | 43 | ||
44 | 44 | ||
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs index 9189bf6..25d1211 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs | |||
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO | |||
75 | /// </summary> | 75 | /// </summary> |
76 | public void Parse() | 76 | public void Parse() |
77 | { | 77 | { |
78 | // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack. | 78 | // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack. |
79 | 79 | ||
80 | 80 | ||
81 | // HEADER BLOCK | 81 | // HEADER BLOCK |
@@ -295,7 +295,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO | |||
295 | myEventCodeChunk = new LSO_Struct.CodeChunk[myStateFrameBlock.StateCount]; | 295 | myEventCodeChunk = new LSO_Struct.CodeChunk[myStateFrameBlock.StateCount]; |
296 | for (int i = 0; i < myStateFrameBlock.StateCount; i++) | 296 | for (int i = 0; i < myStateFrameBlock.StateCount; i++) |
297 | { | 297 | { |
298 | // TODO: Somehow organize events and functions so they can be found again, | 298 | // TODO: Somehow organize events and functions so they can be found again, |
299 | // two level search ain't no good | 299 | // two level search ain't no good |
300 | for (int ii = 0; ii < myStateFrameBlock.StatePointer[i].EventMask.Count - 1; ii++) | 300 | for (int ii = 0; ii < myStateFrameBlock.StatePointer[i].EventMask.Count - 1; ii++) |
301 | { | 301 | { |
@@ -373,7 +373,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO | |||
373 | 373 | ||
374 | //private byte[] br_read_smallendian(int len) | 374 | //private byte[] br_read_smallendian(int len) |
375 | //{ | 375 | //{ |
376 | // byte[] bytes = new byte[len]; | 376 | // byte[] bytes = new byte[len]; |
377 | // br.Read(bytes,0, len); | 377 | // br.Read(bytes,0, len); |
378 | // return bytes; | 378 | // return bytes; |
379 | //} | 379 | //} |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs index d724d22..0d2d7cf 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
67 | public void OnRezScript(uint localID, LLUUID itemID, string script) | 67 | public void OnRezScript(uint localID, LLUUID itemID, string script) |
68 | { | 68 | { |
69 | //myScriptEngine.myScriptManager.StartScript( | 69 | //myScriptEngine.myScriptManager.StartScript( |
70 | // Path.Combine("ScriptEngines", "Default.lsl"), | 70 | // Path.Combine("ScriptEngines", "Default.lsl"), |
71 | // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost() | 71 | // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost() |
72 | //); | 72 | //); |
73 | Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + | 73 | Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " + |
@@ -78,7 +78,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
78 | public void OnRemoveScript(uint localID, LLUUID itemID) | 78 | public void OnRemoveScript(uint localID, LLUUID itemID) |
79 | { | 79 | { |
80 | //myScriptEngine.myScriptManager.StartScript( | 80 | //myScriptEngine.myScriptManager.StartScript( |
81 | // Path.Combine("ScriptEngines", "Default.lsl"), | 81 | // Path.Combine("ScriptEngines", "Default.lsl"), |
82 | // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost() | 82 | // new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost() |
83 | //); | 83 | //); |
84 | Console.WriteLine("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString()); | 84 | Console.WriteLine("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString()); |
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs index 351f26b..060ae0b 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System.Reflection; | 28 | using System.Reflection; |
29 | using System.Runtime.InteropServices; | 29 | using System.Runtime.InteropServices; |
30 | 30 | ||
31 | // General Information about an assembly is controlled through the following | 31 | // General information about an assembly is controlled through the following |
32 | // set of attributes. Change these attribute values to modify the information | 32 | // set of attributes. Change these attribute values to modify the information |
33 | // associated with an assembly. | 33 | // associated with an assembly. |
34 | 34 | ||
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices; | |||
41 | [assembly : AssemblyTrademark("")] | 41 | [assembly : AssemblyTrademark("")] |
42 | [assembly : AssemblyCulture("")] | 42 | [assembly : AssemblyCulture("")] |
43 | 43 | ||
44 | // Setting ComVisible to false makes the types in this assembly not visible | 44 | // Setting ComVisible to false makes the types in this assembly not visible |
45 | // to COM components. If you need to access a type in this assembly from | 45 | // to COM components. If you need to access a type in this assembly from |
46 | // COM, set the ComVisible attribute to true on that type. | 46 | // COM, set the ComVisible attribute to true on that type. |
47 | 47 | ||
48 | [assembly : ComVisible(false)] | 48 | [assembly : ComVisible(false)] |
@@ -54,11 +54,11 @@ using System.Runtime.InteropServices; | |||
54 | // Version information for an assembly consists of the following four values: | 54 | // Version information for an assembly consists of the following four values: |
55 | // | 55 | // |
56 | // Major Version | 56 | // Major Version |
57 | // Minor Version | 57 | // Minor Version |
58 | // Build Number | 58 | // Build Number |
59 | // Revision | 59 | // Revision |
60 | // | 60 | // |
61 | // You can specify all the values or you can default the Revision and Build Numbers | 61 | // You can specify all the values or you can default the Revision and Build Numbers |
62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
63 | 63 | ||
64 | [assembly : AssemblyVersion("1.0.0.0")] | 64 | [assembly : AssemblyVersion("1.0.0.0")] |