aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/LSOEngine
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:09:17 +0000
committerAdam Frisby2008-04-21 07:09:17 +0000
commitfef3b3689492dea63693c964bcdbec9f5137eb5e (patch)
tree7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/ScriptEngine/LSOEngine
parent* Terrain Module code has been reformatted to comply with guidelines. (diff)
downloadopensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Region/ScriptEngine/LSOEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs25
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs7
7 files changed, 15 insertions, 39 deletions
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
index 54328ff..0208350 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
@@ -33,7 +33,6 @@ using System.Reflection.Emit;
33using System.Text; 33using System.Text;
34using System.Threading; 34using System.Threading;
35using OpenSim.Region.ScriptEngine.Common; 35using OpenSim.Region.ScriptEngine.Common;
36using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
37 36
38namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 37namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
39{ 38{
@@ -59,11 +58,11 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
59 string DLL_FileName = asmName.Name + ".dll"; 58 string DLL_FileName = asmName.Name + ".dll";
60 string DLL_FileName_WithPath = Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName; 59 string DLL_FileName_WithPath = Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName;
61 60
62 LSOEngine.LSO.Common.SendToLog("LSO File Name: " + Path.GetFileName(LSO_FileName)); 61 Common.SendToLog("LSO File Name: " + Path.GetFileName(LSO_FileName));
63 LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name); 62 Common.SendToLog("Assembly name: " + asmName.Name);
64 LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll"); 63 Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll");
65 LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode..."); 64 Common.SendToLog("Starting processing of LSL ByteCode...");
66 LSOEngine.LSO.Common.SendToLog(String.Empty); 65 Common.SendToLog(String.Empty);
67 66
68 67
69 // Create Assembly 68 // Create Assembly
@@ -104,7 +103,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
104 LSOP.Parse(); 103 LSOP.Parse();
105 104
106 // Constructor has to be created AFTER LSO_Parser because of accumulated variables 105 // Constructor has to be created AFTER LSO_Parser because of accumulated variables
107 if (LSOEngine.LSO.Common.IL_CreateConstructor) 106 if (Common.IL_CreateConstructor)
108 IL_CREATE_CONSTRUCTOR(typeBuilder, LSOP); 107 IL_CREATE_CONSTRUCTOR(typeBuilder, LSOP);
109 108
110 LSOP.CloseFile(); 109 LSOP.CloseFile();
@@ -113,15 +112,15 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
113 */ 112 */
114 113
115 114
116 LSOEngine.LSO.Common.SendToLog("Attempting to compile assembly..."); 115 Common.SendToLog("Attempting to compile assembly...");
117 // Compile it 116 // Compile it
118 Type type = typeBuilder.CreateType(); 117 Type type = typeBuilder.CreateType();
119 LSOEngine.LSO.Common.SendToLog("Compilation successful!"); 118 Common.SendToLog("Compilation successful!");
120 119
121 LSOEngine.LSO.Common.SendToLog("Saving assembly: " + DLL_FileName); 120 Common.SendToLog("Saving assembly: " + DLL_FileName);
122 asmBuilder.Save(DLL_FileName); 121 asmBuilder.Save(DLL_FileName);
123 122
124 LSOEngine.LSO.Common.SendToLog("Returning assembly filename: " + DLL_FileName); 123 Common.SendToLog("Returning assembly filename: " + DLL_FileName);
125 124
126 125
127 return DLL_FileName; 126 return DLL_FileName;
@@ -166,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
166 165
167 private static void IL_CREATE_CONSTRUCTOR(TypeBuilder typeBuilder, LSO_Parser LSOP) 166 private static void IL_CREATE_CONSTRUCTOR(TypeBuilder typeBuilder, LSO_Parser LSOP)
168 { 167 {
169 LSOEngine.LSO.Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); 168 Common.SendToDebug("IL_CREATE_CONSTRUCTOR()");
170 //ConstructorBuilder constructor = typeBuilder.DefineConstructor( 169 //ConstructorBuilder constructor = typeBuilder.DefineConstructor(
171 // MethodAttributes.Public, 170 // MethodAttributes.Public,
172 // CallingConventions.Standard, 171 // CallingConventions.Standard,
@@ -235,7 +234,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
235 Type datatype = null; 234 Type datatype = null;
236 235
237 // Push data to stack 236 // Push data to stack
238 LSOEngine.LSO.Common.SendToDebug("Adding to static (" + pos + ") type: " + 237 Common.SendToDebug("Adding to static (" + pos + ") type: " +
239 ((LSO_Enums.Variable_Type_Codes) sb.ObjectType).ToString() + " (" + sb.ObjectType + 238 ((LSO_Enums.Variable_Type_Codes) sb.ObjectType).ToString() + " (" + sb.ObjectType +
240 ")"); 239 ")");
241 switch ((LSO_Enums.Variable_Type_Codes) sb.ObjectType) 240 switch ((LSO_Enums.Variable_Type_Codes) sb.ObjectType)
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs
index 60d68f5..6d0e35c 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs
@@ -26,10 +26,6 @@
26 */ 26 */
27 27
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System;
30using System.Reflection;
31using System.Reflection.Emit;
32
33namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 29namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
34{ 30{
35 internal partial class LSO_Parser 31 internal partial class LSO_Parser
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs
index ad216aa..1b73311 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30
31namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 28namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
32{ 29{
33 //public partial class LSL_BaseClass 30 //public partial class LSL_BaseClass
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
index a110c28..e4a57e8 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
@@ -33,7 +33,6 @@ using System.IO;
33using System.Reflection; 33using System.Reflection;
34using System.Reflection.Emit; 34using System.Reflection.Emit;
35using System.Text; 35using System.Text;
36using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
37 36
38namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 37namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
39{ 38{
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
index 3b5ca0f..f035c03 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.IO;
31using System.Text;
32using OpenSim.Region.ScriptEngine.LSOEngine.LSO; 28using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
33 29
34namespace OpenSim.Region.ScriptEngine.LSOEngine 30namespace OpenSim.Region.ScriptEngine.LSOEngine
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
index 8495037..3c0e9cd 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
@@ -27,18 +27,12 @@
27 27
28using System; 28using System;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Framework.Console;
31using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
33using OpenSim.Region.ScriptEngine.Common;
34using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
35using EventManager = OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.EventManager;
36using ScriptManager=OpenSim.Region.ScriptEngine.LSOEngine.ScriptManager;
37 31
38namespace OpenSim.Region.ScriptEngine.LSOEngine 32namespace OpenSim.Region.ScriptEngine.LSOEngine
39{ 33{
40 [Serializable] 34 [Serializable]
41 public class ScriptEngine : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptEngine 35 public class ScriptEngine : Common.ScriptEngineBase.ScriptEngine
42 { 36 {
43 // We need to override a few things for our DotNetEngine 37 // We need to override a few things for our DotNetEngine
44 public override void Initialise(Scene scene, IConfigSource config) 38 public override void Initialise(Scene scene, IConfigSource config)
@@ -46,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
46 InitializeEngine(scene, config, true, GetScriptManager()); 40 InitializeEngine(scene, config, true, GetScriptManager());
47 } 41 }
48 42
49 public override OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager _GetScriptManager() 43 public override Common.ScriptEngineBase.ScriptManager _GetScriptManager()
50 { 44 {
51 return new ScriptManager(this); 45 return new ScriptManager(this);
52 } 46 }
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
index a933b08..0434f55 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
@@ -26,11 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
32using System.Runtime.Serialization.Formatters.Binary;
33using System.Threading;
34using libsecondlife; 29using libsecondlife;
35using OpenSim.Framework; 30using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
@@ -39,7 +34,7 @@ using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
39 34
40namespace OpenSim.Region.ScriptEngine.LSOEngine 35namespace OpenSim.Region.ScriptEngine.LSOEngine
41{ 36{
42 public class ScriptManager : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager 37 public class ScriptManager : Common.ScriptEngineBase.ScriptManager
43 { 38 {
44 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine) 39 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine)
45 : base(scriptEngine) 40 : base(scriptEngine)