aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/ScriptEngine
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs44
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs118
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs74
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs106
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs26
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs76
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs24
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs1710
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Helpers.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs50
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs76
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs28
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/EventManager.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs14
-rwxr-xr-xOpenSim/Region/ScriptEngine/XEngine/XEngine.cs82
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs2
49 files changed, 1315 insertions, 1315 deletions
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
index a7fa502..b71932e 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
46 /// <param name="assembly"></param> 46 /// <param name="assembly"></param>
47 /// <param name="linemap"></param> 47 /// <param name="linemap"></param>
48 void PerformScriptCompile( 48 void PerformScriptCompile(
49 string source, string asset, UUID ownerID, 49 string source, string asset, UUID ownerID,
50 out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap); 50 out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap);
51 51
52 /// <summary> 52 /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
index 361a0b9..2e1dbbe 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
58 /// Post an event to a single script 58 /// Post an event to a single script
59 /// </summary> 59 /// </summary>
60 bool PostScriptEvent(UUID itemID, EventParams parms); 60 bool PostScriptEvent(UUID itemID, EventParams parms);
61 61
62 /// <summary> 62 /// <summary>
63 /// Post event to an entire prim 63 /// Post event to an entire prim
64 /// </summary> 64 /// </summary>
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
95 /// Assemblies that need to be referenced when compiling scripts. 95 /// Assemblies that need to be referenced when compiling scripts.
96 /// </summary> 96 /// </summary>
97 /// <remarks> 97 /// <remarks>
98 /// These are currently additional to those always referenced by the compiler, BUT THIS MAY CHANGE IN THE 98 /// These are currently additional to those always referenced by the compiler, BUT THIS MAY CHANGE IN THE
99 /// FUTURE. 99 /// FUTURE.
100 /// This can be null if there are no additional assemblies. 100 /// This can be null if there are no additional assemblies.
101 /// </remarks> 101 /// </remarks>
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index e4297c4..40c2fd2 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
104 string State { get; set; } 104 string State { get; set; }
105 105
106 /// <summary> 106 /// <summary>
107 /// If true then the engine is responsible for persisted state. If false then some other component may 107 /// If true then the engine is responsible for persisted state. If false then some other component may
108 /// persist state (e.g. attachments persisting in assets). 108 /// persist state (e.g. attachments persisting in assets).
109 /// </summary> 109 /// </summary>
110 bool StatePersistedHere { get; } 110 bool StatePersistedHere { get; }
@@ -193,7 +193,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
193 /// </summary> 193 /// </summary>
194 /// <param name="data"></param> 194 /// <param name="data"></param>
195 void PostEvent(EventParams data); 195 void PostEvent(EventParams data);
196 196
197 void Suspend(); 197 void Suspend();
198 void Resume(); 198 void Resume();
199 199
@@ -223,7 +223,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
223 /// Reset the script. 223 /// Reset the script.
224 /// </summary> 224 /// </summary>
225 /// <remarks> 225 /// <remarks>
226 /// This must not be called by any thread other than the one executing the scripts current event. This is 226 /// This must not be called by any thread other than the one executing the scripts current event. This is
227 /// because there is no wait or abort logic if another thread is in the middle of processing a script event. 227 /// because there is no wait or abort logic if another thread is in the middle of processing a script event.
228 /// Such an external thread should use ResetScript() instead. 228 /// Such an external thread should use ResetScript() instead.
229 /// </remarks> 229 /// </remarks>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 84d44a1..6a39bb9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -81,64 +81,64 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
81 81
82 public Dataserver DataserverPlugin 82 public Dataserver DataserverPlugin
83 { 83 {
84 get 84 get
85 { 85 {
86 lock (staticLock) 86 lock (staticLock)
87 return m_Dataserver[m_ScriptEngine]; 87 return m_Dataserver[m_ScriptEngine];
88 } 88 }
89 } 89 }
90 90
91 public Timer TimerPlugin 91 public Timer TimerPlugin
92 { 92 {
93 get 93 get
94 { 94 {
95 lock (staticLock) 95 lock (staticLock)
96 return m_Timer[m_ScriptEngine]; 96 return m_Timer[m_ScriptEngine];
97 } 97 }
98 } 98 }
99 99
100 public HttpRequest HttpRequestPlugin 100 public HttpRequest HttpRequestPlugin
101 { 101 {
102 get 102 get
103 { 103 {
104 lock (staticLock) 104 lock (staticLock)
105 return m_HttpRequest[m_ScriptEngine]; 105 return m_HttpRequest[m_ScriptEngine];
106 } 106 }
107 } 107 }
108 108
109 public Listener ListenerPlugin 109 public Listener ListenerPlugin
110 { 110 {
111 get 111 get
112 { 112 {
113 lock (staticLock) 113 lock (staticLock)
114 return m_Listener[m_ScriptEngine]; 114 return m_Listener[m_ScriptEngine];
115 } 115 }
116 } 116 }
117 117
118 public SensorRepeat SensorRepeatPlugin 118 public SensorRepeat SensorRepeatPlugin
119 { 119 {
120 get 120 get
121 { 121 {
122 lock (staticLock) 122 lock (staticLock)
123 return m_SensorRepeat[m_ScriptEngine]; 123 return m_SensorRepeat[m_ScriptEngine];
124 } 124 }
125 } 125 }
126 126
127 public XmlRequest XmlRequestPlugin 127 public XmlRequest XmlRequestPlugin
128 { 128 {
129 get 129 get
130 { 130 {
131 lock (staticLock) 131 lock (staticLock)
132 return m_XmlRequest[m_ScriptEngine]; 132 return m_XmlRequest[m_ScriptEngine];
133 } 133 }
134 } 134 }
135 135
136 public IScriptEngine[] ScriptEngines 136 public IScriptEngine[] ScriptEngines
137 { 137 {
138 get 138 get
139 { 139 {
140 lock (staticLock) 140 lock (staticLock)
141 return m_ScriptEngines.ToArray(); 141 return m_ScriptEngines.ToArray();
142 } 142 }
143 } 143 }
144 144
@@ -387,7 +387,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
387 } 387 }
388 } 388 }
389 389
390 390
391 391
392 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID) 392 public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
393 { 393 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5269bf9..8f9ff03 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
100 100
101 protected IScriptEngine m_ScriptEngine; 101 protected IScriptEngine m_ScriptEngine;
102 protected SceneObjectPart m_host; 102 protected SceneObjectPart m_host;
103 103
104 /// <summary> 104 /// <summary>
105 /// The item that hosts this script 105 /// The item that hosts this script
106 /// </summary> 106 /// </summary>
@@ -298,7 +298,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
298 m_host = host; 298 m_host = host;
299 m_item = item; 299 m_item = item;
300 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false); 300 m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
301 301
302 LoadConfig(); 302 LoadConfig();
303 303
304 m_TransferModule = 304 m_TransferModule =
@@ -400,7 +400,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
400 } 400 }
401 401
402 IConfig smtpConfig = seConfigSource.Configs["SMTP"]; 402 IConfig smtpConfig = seConfigSource.Configs["SMTP"];
403 if (smtpConfig != null) 403 if (smtpConfig != null)
404 { 404 {
405 // there's an smtp config, so load in the snooze time. 405 // there's an smtp config, so load in the snooze time.
406 EMAIL_PAUSE_TIME = smtpConfig.GetInt("email_pause_time", EMAIL_PAUSE_TIME); 406 EMAIL_PAUSE_TIME = smtpConfig.GetInt("email_pause_time", EMAIL_PAUSE_TIME);
@@ -666,7 +666,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
666 case ScriptBaseClass.LINK_SET: 666 case ScriptBaseClass.LINK_SET:
667 return new List<SceneObjectPart>(part.ParentGroup.Parts); 667 return new List<SceneObjectPart>(part.ParentGroup.Parts);
668 668
669 case ScriptBaseClass.LINK_ROOT: 669 case ScriptBaseClass.LINK_ROOT:
670 ret.Add(part.ParentGroup.RootPart); 670 ret.Add(part.ParentGroup.RootPart);
671 return ret; 671 return ret;
672 672
@@ -807,8 +807,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
807 m_host.AddScriptLPS(1); 807 m_host.AddScriptLPS(1);
808 lock (Util.RandomClass) 808 lock (Util.RandomClass)
809 { 809 {
810 return Util.RandomClass.NextDouble() * mag; 810 return Util.RandomClass.NextDouble() * mag;
811 } 811 }
812 } 812 }
813 813
814 public LSL_Integer llFloor(double f) 814 public LSL_Integer llFloor(double f)
@@ -1097,7 +1097,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1097 m_host.AddScriptLPS(1); 1097 m_host.AddScriptLPS(1);
1098 /* This method is more accurate than the SL one, and thus causes problems 1098 /* This method is more accurate than the SL one, and thus causes problems
1099 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._. 1099 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
1100 1100
1101 double dotProduct = LSL_Vector.Dot(a, b); 1101 double dotProduct = LSL_Vector.Dot(a, b);
1102 LSL_Vector crossProduct = LSL_Vector.Cross(a, b); 1102 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
1103 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b); 1103 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
@@ -1115,12 +1115,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1115 1115
1116 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w); 1116 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
1117 */ 1117 */
1118 1118
1119 // This method mimics the 180 errors found in SL 1119 // This method mimics the 180 errors found in SL
1120 // See www.euclideanspace.com... angleBetween 1120 // See www.euclideanspace.com... angleBetween
1121 LSL_Vector vec_a = a; 1121 LSL_Vector vec_a = a;
1122 LSL_Vector vec_b = b; 1122 LSL_Vector vec_b = b;
1123 1123
1124 // Eliminate zero length 1124 // Eliminate zero length
1125 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a); 1125 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
1126 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b); 1126 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
@@ -1129,7 +1129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1129 { 1129 {
1130 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 1130 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
1131 } 1131 }
1132 1132
1133 // Normalize 1133 // Normalize
1134 vec_a = llVecNorm(vec_a); 1134 vec_a = llVecNorm(vec_a);
1135 vec_b = llVecNorm(vec_b); 1135 vec_b = llVecNorm(vec_b);
@@ -1137,13 +1137,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1137 // Calculate axis and rotation angle 1137 // Calculate axis and rotation angle
1138 LSL_Vector axis = vec_a % vec_b; 1138 LSL_Vector axis = vec_a % vec_b;
1139 LSL_Float cos_theta = vec_a * vec_b; 1139 LSL_Float cos_theta = vec_a * vec_b;
1140 1140
1141 // Check if parallel 1141 // Check if parallel
1142 if (cos_theta > 0.99999) 1142 if (cos_theta > 0.99999)
1143 { 1143 {
1144 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 1144 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
1145 } 1145 }
1146 1146
1147 // Check if anti-parallel 1147 // Check if anti-parallel
1148 else if (cos_theta < -0.99999) 1148 else if (cos_theta < -0.99999)
1149 { 1149 {
@@ -1164,7 +1164,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1164 return new LSL_Rotation(x,y,z,s); 1164 return new LSL_Rotation(x,y,z,s);
1165 } 1165 }
1166 } 1166 }
1167 1167
1168 public void llWhisper(int channelID, string text) 1168 public void llWhisper(int channelID, string text)
1169 { 1169 {
1170 m_host.AddScriptLPS(1); 1170 m_host.AddScriptLPS(1);
@@ -1261,7 +1261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1261 { 1261 {
1262 World.SimChat(Utils.StringToBytes(text), 1262 World.SimChat(Utils.StringToBytes(text),
1263 ChatTypeEnum.Shout, channelID, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true); 1263 ChatTypeEnum.Shout, channelID, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);
1264 1264
1265 } 1265 }
1266 1266
1267 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 1267 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
@@ -1830,7 +1830,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1830 { 1830 {
1831 m_host.AddScriptLPS(1); 1831 m_host.AddScriptLPS(1);
1832 SceneObjectGroup group = m_host.ParentGroup; 1832 SceneObjectGroup group = m_host.ParentGroup;
1833 1833
1834 if (group == null || group.IsDeleted || group.inTransit) 1834 if (group == null || group.IsDeleted || group.inTransit)
1835 return 1.0f; 1835 return 1.0f;
1836 1836
@@ -1841,7 +1841,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1841 { 1841 {
1842 m_host.AddScriptLPS(1); 1842 m_host.AddScriptLPS(1);
1843 SceneObjectGroup group = m_host.ParentGroup; 1843 SceneObjectGroup group = m_host.ParentGroup;
1844 1844
1845 if (group == null || group.IsDeleted || group.inTransit) 1845 if (group == null || group.IsDeleted || group.inTransit)
1846 return 1.0f; 1846 return 1.0f;
1847 1847
@@ -1970,7 +1970,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1970 string userAgent = m_UrlModule.GetHttpHeader(new UUID(id), "user-agent"); 1970 string userAgent = m_UrlModule.GetHttpHeader(new UUID(id), "user-agent");
1971 if (userAgent.IndexOf("SecondLife") < 0) 1971 if (userAgent.IndexOf("SecondLife") < 0)
1972 return; // Not the embedded browser. Is this check good enough? 1972 return; // Not the embedded browser. Is this check good enough?
1973 1973
1974 // Use the IP address of the client and check against the request 1974 // Use the IP address of the client and check against the request
1975 // seperate logins from the same IP will allow all of them to get non-text/plain as long 1975 // seperate logins from the same IP will allow all of them to get non-text/plain as long
1976 // as the owner is in the region. Same as SL! 1976 // as the owner is in the region. Same as SL!
@@ -2030,7 +2030,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2030 m_UrlModule.HttpContentType(new UUID(id),type); 2030 m_UrlModule.HttpContentType(new UUID(id),type);
2031 } 2031 }
2032 } 2032 }
2033*/ 2033*/
2034 public void SetTexGen(SceneObjectPart part, int face,int style) 2034 public void SetTexGen(SceneObjectPart part, int face,int style)
2035 { 2035 {
2036 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) 2036 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
@@ -2774,7 +2774,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2774 public void llSetRot(LSL_Rotation rot) 2774 public void llSetRot(LSL_Rotation rot)
2775 { 2775 {
2776 m_host.AddScriptLPS(1); 2776 m_host.AddScriptLPS(1);
2777 2777
2778 // try to let this work as in SL... 2778 // try to let this work as in SL...
2779 if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart)) 2779 if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart))
2780 { 2780 {
@@ -2960,7 +2960,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2960 m_host.AddScriptLPS(1); 2960 m_host.AddScriptLPS(1);
2961 m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0); 2961 m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0);
2962 } 2962 }
2963 2963
2964 public void llSetAngularVelocity(LSL_Vector avel, int local) 2964 public void llSetAngularVelocity(LSL_Vector avel, int local)
2965 { 2965 {
2966 m_host.AddScriptLPS(1); 2966 m_host.AddScriptLPS(1);
@@ -3129,7 +3129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3129 { 3129 {
3130 m_SoundModule.SendSound( 3130 m_SoundModule.SendSound(
3131 m_host.UUID, 3131 m_host.UUID,
3132 ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound), 3132 ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound),
3133 volume, false, 0, 3133 volume, false, 0,
3134 0, false, false); 3134 0, false, false);
3135 } 3135 }
@@ -3602,7 +3602,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3602// LSL_Vector up = new LSL_Vector(0.0, 0.0, 1.0); 3602// LSL_Vector up = new LSL_Vector(0.0, 0.0, 1.0);
3603 // find normalized left axis parallel to horizon 3603 // find normalized left axis parallel to horizon
3604// LSL_Vector left = llVecNorm(LSL_Vector.Cross(up, dir)); 3604// LSL_Vector left = llVecNorm(LSL_Vector.Cross(up, dir));
3605 3605
3606 LSL_Vector left = new LSL_Vector(-dir.y, dir.x, 0.0f); 3606 LSL_Vector left = new LSL_Vector(-dir.y, dir.x, 0.0f);
3607 left = llVecNorm(left); 3607 left = llVecNorm(left);
3608 // make up orthogonal to left and dir 3608 // make up orthogonal to left and dir
@@ -3851,7 +3851,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3851 ScriptSleep(2000); 3851 ScriptSleep(2000);
3852 return; 3852 return;
3853 } 3853 }
3854 3854
3855 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3855 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
3856 // InstantMessageModule.OnInstantMessage searches through a list of scenes for a client matching the toAgent, 3856 // InstantMessageModule.OnInstantMessage searches through a list of scenes for a client matching the toAgent,
3857 // but I don't think we have a list of scenes available from here. 3857 // but I don't think we have a list of scenes available from here.
@@ -3864,7 +3864,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3864 UUID friendTransactionID = UUID.Random(); 3864 UUID friendTransactionID = UUID.Random();
3865 3865
3866 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3866 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
3867 3867
3868 GridInstantMessage msg = new GridInstantMessage(); 3868 GridInstantMessage msg = new GridInstantMessage();
3869 msg.fromAgentID = new Guid(m_host.OwnerID.ToString()); // fromAgentID.Guid; 3869 msg.fromAgentID = new Guid(m_host.OwnerID.ToString()); // fromAgentID.Guid;
3870 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3870 msg.toAgentID = new Guid(user); // toAgentID.Guid;
@@ -4217,7 +4217,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4217 } 4217 }
4218 4218
4219 ScenePresence presence = World.GetScenePresence(agentID); 4219 ScenePresence presence = World.GetScenePresence(agentID);
4220 4220
4221 if (presence != null) 4221 if (presence != null)
4222 { 4222 {
4223 // If permissions are being requested from an NPC and were not implicitly granted above then 4223 // If permissions are being requested from an NPC and were not implicitly granted above then
@@ -4285,7 +4285,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4285 m_host.TaskInventory.LockItemsForWrite(true); 4285 m_host.TaskInventory.LockItemsForWrite(true);
4286 m_host.TaskInventory[m_item.ItemID].PermsMask = answer; 4286 m_host.TaskInventory[m_item.ItemID].PermsMask = answer;
4287 m_host.TaskInventory.LockItemsForWrite(false); 4287 m_host.TaskInventory.LockItemsForWrite(false);
4288 4288
4289 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams( 4289 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
4290 "run_time_permissions", new Object[] { 4290 "run_time_permissions", new Object[] {
4291 new LSL_Integer(answer) }, 4291 new LSL_Integer(answer) },
@@ -4363,7 +4363,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4363 UUID targetID; 4363 UUID targetID;
4364 4364
4365 if (!UUID.TryParse(target, out targetID)) 4365 if (!UUID.TryParse(target, out targetID))
4366 return; 4366 return;
4367 4367
4368 SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID); 4368 SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID);
4369 if (targetPart == null) 4369 if (targetPart == null)
@@ -4493,7 +4493,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4493 } 4493 }
4494 } 4494 }
4495 finally { } 4495 finally { }
4496 4496
4497 newRoot.ParentGroup.HasGroupChanged = true; 4497 newRoot.ParentGroup.HasGroupChanged = true;
4498 newRoot.ParentGroup.ScheduleGroupForFullUpdate(); 4498 newRoot.ParentGroup.ScheduleGroupForFullUpdate();
4499 } 4499 }
@@ -4515,7 +4515,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4515 m_host.AddScriptLPS(1); 4515 m_host.AddScriptLPS(1);
4516 4516
4517 TaskInventoryItem item = m_item; 4517 TaskInventoryItem item = m_item;
4518 4518
4519 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 4519 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
4520 && !m_automaticLinkPermission) 4520 && !m_automaticLinkPermission)
4521 { 4521 {
@@ -4634,7 +4634,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4634 count = count + 1; 4634 count = count + 1;
4635 } 4635 }
4636 } 4636 }
4637 4637
4638 m_host.TaskInventory.LockItemsForRead(false); 4638 m_host.TaskInventory.LockItemsForRead(false);
4639 return count; 4639 return count;
4640 } 4640 }
@@ -4729,7 +4729,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4729 4729
4730 if (agentItem == null) 4730 if (agentItem == null)
4731 { 4731 {
4732 llSay(0, message); 4732 llSay(0, message);
4733 return; 4733 return;
4734 } 4734 }
4735 4735
@@ -4758,7 +4758,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4758 if (m_TransferModule != null) 4758 if (m_TransferModule != null)
4759 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); 4759 m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
4760 } 4760 }
4761 4761
4762 //This delay should only occur when giving inventory to avatars. 4762 //This delay should only occur when giving inventory to avatars.
4763 ScriptSleep(m_sleepMsOnGiveInventory); 4763 ScriptSleep(m_sleepMsOnGiveInventory);
4764 } 4764 }
@@ -5064,7 +5064,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5064 // Can't TP sitting avatars 5064 // Can't TP sitting avatars
5065 if (presence.ParentID != 0) // Sitting 5065 if (presence.ParentID != 0) // Sitting
5066 return; 5066 return;
5067 5067
5068 if (m_item.PermsGranter == agentId) 5068 if (m_item.PermsGranter == agentId)
5069 { 5069 {
5070 // If attached using llAttachToAvatarTemp, cowardly refuse 5070 // If attached using llAttachToAvatarTemp, cowardly refuse
@@ -5190,7 +5190,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5190 5190
5191 string movementAnimation = presence.Animator.CurrentMovementAnimation; 5191 string movementAnimation = presence.Animator.CurrentMovementAnimation;
5192 string lslMovementAnimation; 5192 string lslMovementAnimation;
5193 5193
5194 if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation)) 5194 if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation))
5195 return lslMovementAnimation; 5195 return lslMovementAnimation;
5196 } 5196 }
@@ -5531,7 +5531,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5531 rot.Normalize(); 5531 rot.Normalize();
5532 5532
5533 double angle = 2 * Math.Acos(rot.s); 5533 double angle = 2 * Math.Acos(rot.s);
5534 if (angle > Math.PI) 5534 if (angle > Math.PI)
5535 angle = 2 * Math.PI - angle; 5535 angle = 2 * Math.PI - angle;
5536 5536
5537 return angle; 5537 return angle;
@@ -6916,10 +6916,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6916 SceneObjectPart part = World.GetSceneObjectPart(uuid); 6916 SceneObjectPart part = World.GetSceneObjectPart(uuid);
6917 if (part != null) 6917 if (part != null)
6918 { 6918 {
6919 6919
6920 if(part.ParentGroup.IsAttachment) 6920 if(part.ParentGroup.IsAttachment)
6921 { 6921 {
6922 uuid = part.ParentGroup.AttachedAvatar; 6922 uuid = part.ParentGroup.AttachedAvatar;
6923 } 6923 }
6924 else 6924 else
6925 { 6925 {
@@ -10266,7 +10266,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10266 } 10266 }
10267 break; 10267 break;
10268 10268
10269 case ScriptBaseClass.PRIM_ROTATION: 10269 case ScriptBaseClass.PRIM_ROTATION:
10270 if (remain < 1) 10270 if (remain < 1)
10271 return new LSL_List(); 10271 return new LSL_List();
10272 10272
@@ -10329,7 +10329,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10329 catch (InvalidCastException e) 10329 catch (InvalidCastException e)
10330 { 10330 {
10331 Error( 10331 Error(
10332 originFunc, 10332 originFunc,
10333 string.Format("Error running rule #{0}: arg #{1} - ", rulesParsed, idx - idxStart) + e.Message); 10333 string.Format("Error running rule #{0}: arg #{1} - ", rulesParsed, idx - idxStart) + e.Message);
10334 } 10334 }
10335 10335
@@ -10433,7 +10433,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10433 } 10433 }
10434 while (str2.EndsWith("=")) 10434 while (str2.EndsWith("="))
10435 str2 = str2.Substring(0, str2.Length - 1); 10435 str2 = str2.Substring(0, str2.Length - 1);
10436 10436
10437 byte[] d1 = new byte[str1.Length]; 10437 byte[] d1 = new byte[str1.Length];
10438 byte[] d2 = new byte[str2.Length]; 10438 byte[] d2 = new byte[str2.Length];
10439 10439
@@ -10638,7 +10638,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10638 10638
10639 Vector3 box = presence.Appearance.AvatarBoxSize * 0.5f; 10639 Vector3 box = presence.Appearance.AvatarBoxSize * 0.5f;
10640 10640
10641 if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID 10641 if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID
10642 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) 10642 == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
10643/* 10643/*
10644 { 10644 {
@@ -10803,7 +10803,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10803 10803
10804 List<SceneObjectPart> parts; 10804 List<SceneObjectPart> parts;
10805 List<ScenePresence> avatars; 10805 List<ScenePresence> avatars;
10806 10806
10807 LSL_List res = new LSL_List(); 10807 LSL_List res = new LSL_List();
10808 LSL_List remaining = new LSL_List(); 10808 LSL_List remaining = new LSL_List();
10809 10809
@@ -12887,7 +12887,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12887 return; 12887 return;
12888 } 12888 }
12889 } 12889 }
12890 12890
12891 ScenePresence avatar = World.GetScenePresence(detectedParams.Key); 12891 ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
12892 if (avatar != null) 12892 if (avatar != null)
12893 { 12893 {
@@ -13239,7 +13239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13239 13239
13240 byte[] d2 = new Byte[data1.Length]; 13240 byte[] d2 = new Byte[data1.Length];
13241 int pos = 0; 13241 int pos = 0;
13242 13242
13243 if (data1.Length <= data2.Length) 13243 if (data1.Length <= data2.Length)
13244 { 13244 {
13245 Array.Copy(data2, 0, d2, 0, data1.Length); 13245 Array.Copy(data2, 0, d2, 0, data1.Length);
@@ -13636,7 +13636,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13636 13636
13637 LSL_List ret = new LSL_List(); 13637 LSL_List ret = new LSL_List();
13638 UUID key = new UUID(); 13638 UUID key = new UUID();
13639 13639
13640 13640
13641 if (UUID.TryParse(id, out key)) 13641 if (UUID.TryParse(id, out key))
13642 { 13642 {
@@ -13824,7 +13824,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13824 case ScriptBaseClass.OBJECT_NAME: 13824 case ScriptBaseClass.OBJECT_NAME:
13825 ret.Add(new LSL_String(obj.Name)); 13825 ret.Add(new LSL_String(obj.Name));
13826 break; 13826 break;
13827 case ScriptBaseClass.OBJECT_DESC: 13827 case ScriptBaseClass.OBJECT_DESC:
13828 ret.Add(new LSL_String(obj.Description)); 13828 ret.Add(new LSL_String(obj.Description));
13829 break; 13829 break;
13830 case ScriptBaseClass.OBJECT_POS: 13830 case ScriptBaseClass.OBJECT_POS:
@@ -13865,7 +13865,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13865 } 13865 }
13866 else 13866 else
13867 { 13867 {
13868 vel = obj.Velocity; 13868 vel = obj.Velocity;
13869 } 13869 }
13870 13870
13871 ret.Add(vel); 13871 ret.Add(vel);
@@ -14263,8 +14263,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14263 ossl.CheckThreatLevel(ThreatLevel.High, "print"); 14263 ossl.CheckThreatLevel(ThreatLevel.High, "print");
14264 m_log.Info("LSL print():" + str); 14264 m_log.Info("LSL print():" + str);
14265 } 14265 }
14266 } 14266 }
14267 14267
14268 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link) 14268 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
14269 { 14269 {
14270 List<SceneObjectPart> parts = GetLinkParts(link); 14270 List<SceneObjectPart> parts = GetLinkParts(link);
@@ -14488,7 +14488,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14488 { 14488 {
14489 // get work copies 14489 // get work copies
14490 float sx = rayStart.X; 14490 float sx = rayStart.X;
14491 float ex = rayEnd.X; 14491 float ex = rayEnd.X;
14492 float sy = rayStart.Y; 14492 float sy = rayStart.Y;
14493 float ey = rayEnd.Y; 14493 float ey = rayEnd.Y;
14494 14494
@@ -14497,7 +14497,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14497 14497
14498 // region size info 14498 // region size info
14499 float rsx = World.RegionInfo.RegionSizeX; 14499 float rsx = World.RegionInfo.RegionSizeX;
14500 14500
14501 float tmp; 14501 float tmp;
14502 14502
14503 // region bounds 14503 // region bounds
@@ -14513,7 +14513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14513 sy += dy * dx; 14513 sy += dy * dx;
14514 sx = 0; 14514 sx = 0;
14515 } 14515 }
14516 else if(sx >= rsx) 14516 else if(sx >= rsx)
14517 { 14517 {
14518 if(ex >= rsx) // totally outside 14518 if(ex >= rsx) // totally outside
14519 return null; 14519 return null;
@@ -14537,7 +14537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14537 sx += dy * dx; 14537 sx += dy * dx;
14538 sy = 0; 14538 sy = 0;
14539 } 14539 }
14540 else if(sy >= rsy) 14540 else if(sy >= rsy)
14541 { 14541 {
14542 if(dy >= 0) // out and going away 14542 if(dy >= 0) // out and going away
14543 return null; 14543 return null;
@@ -14875,7 +14875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14875 { 14875 {
14876 return a.Depth.CompareTo(b.Depth); 14876 return a.Depth.CompareTo(b.Depth);
14877 }); 14877 });
14878 14878
14879 int values = 0; 14879 int values = 0;
14880 SceneObjectGroup thisgrp = m_host.ParentGroup; 14880 SceneObjectGroup thisgrp = m_host.ParentGroup;
14881 14881
@@ -14931,7 +14931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
14931 list.Add(new LSL_Integer(values)); 14931 list.Add(new LSL_Integer(values));
14932 return list; 14932 return list;
14933 } 14933 }
14934 14934
14935 14935
14936 /// <summary> 14936 /// <summary>
14937 /// Implementation of llCastRay similar to SL 2015-04-21. 14937 /// Implementation of llCastRay similar to SL 2015-04-21.
@@ -15076,7 +15076,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
15076 isNonphysical = !isPhysical; 15076 isNonphysical = !isPhysical;
15077 isPhantom = ((part.Flags & PrimFlags.Phantom) != 0) || 15077 isPhantom = ((part.Flags & PrimFlags.Phantom) != 0) ||
15078 (part.VolumeDetectActive); 15078 (part.VolumeDetectActive);
15079 15079
15080 if (isPhysical && rejectPhysical) 15080 if (isPhysical && rejectPhysical)
15081 continue; 15081 continue;
15082 if (isNonphysical && rejectNonphysical) 15082 if (isNonphysical && rejectNonphysical)
@@ -16291,7 +16291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
16291 pos = sitroot.AbsolutePosition + pos * sitroot.GetWorldRotation(); 16291 pos = sitroot.AbsolutePosition + pos * sitroot.GetWorldRotation();
16292 } 16292 }
16293 else 16293 else
16294 pos = avatar.AbsolutePosition; 16294 pos = avatar.AbsolutePosition;
16295 16295
16296 res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z)); 16296 res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z));
16297 break; 16297 break;
@@ -16471,7 +16471,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
16471 res.Add(new LSL_String("")); 16471 res.Add(new LSL_String(""));
16472 break; 16472 break;
16473 16473
16474 case (int)ScriptBaseClass.PRIM_ROT_LOCAL: 16474 case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
16475 Quaternion lrot = avatar.Rotation; 16475 Quaternion lrot = avatar.Rotation;
16476 res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W)); 16476 res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W));
16477 break; 16477 break;
@@ -16577,7 +16577,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
16577 presence.SetAnimationOverride("ALL", UUID.Zero); 16577 presence.SetAnimationOverride("ALL", UUID.Zero);
16578 return; 16578 return;
16579 } 16579 }
16580 16580
16581 string state = String.Empty; 16581 string state = String.Empty;
16582 16582
16583 foreach (KeyValuePair<string, string> kvp in MovementAnimationsForLSL) 16583 foreach (KeyValuePair<string, string> kvp in MovementAnimationsForLSL)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index 8cd065b..cec595d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -831,6 +831,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
831 } 831 }
832 832
833 return success; 833 return success;
834 } 834 }
835 } 835 }
836} 836}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index 1e26036..692bec0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -107,14 +107,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
107 /// Dumps an error message on the debug console. 107 /// Dumps an error message on the debug console.
108 /// </summary> 108 /// </summary>
109 /// <param name='message'></param> 109 /// <param name='message'></param>
110 internal void MODShoutError(string message) 110 internal void MODShoutError(string message)
111 { 111 {
112 if (message.Length > 1023) 112 if (message.Length > 1023)
113 message = message.Substring(0, 1023); 113 message = message.Substring(0, 1023);
114 114
115 World.SimChat( 115 World.SimChat(
116 Utils.StringToBytes(message), 116 Utils.StringToBytes(message),
117 ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, 117 ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL,
118 m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false); 118 m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false);
119 119
120 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>(); 120 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
@@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
122 } 122 }
123 123
124 /// <summary> 124 /// <summary>
125 /// 125 ///
126 /// </summary> 126 /// </summary>
127 /// <param name="fname">The name of the function to invoke</param> 127 /// <param name="fname">The name of the function to invoke</param>
128 /// <param name="parms">List of parameters</param> 128 /// <param name="parms">List of parameters</param>
@@ -130,9 +130,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
130 public void modInvokeN(string fname, params object[] parms) 130 public void modInvokeN(string fname, params object[] parms)
131 { 131 {
132// m_log.DebugFormat( 132// m_log.DebugFormat(
133// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 133// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
134// fname, 134// fname,
135// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 135// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
136// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 136// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
137 137
138 Type returntype = m_comms.LookupReturnType(fname); 138 Type returntype = m_comms.LookupReturnType(fname);
@@ -145,9 +145,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
145 public LSL_String modInvokeS(string fname, params object[] parms) 145 public LSL_String modInvokeS(string fname, params object[] parms)
146 { 146 {
147// m_log.DebugFormat( 147// m_log.DebugFormat(
148// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 148// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
149// fname, 149// fname,
150// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 150// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
151// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 151// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
152 152
153 Type returntype = m_comms.LookupReturnType(fname); 153 Type returntype = m_comms.LookupReturnType(fname);
@@ -161,9 +161,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
161 public LSL_Integer modInvokeI(string fname, params object[] parms) 161 public LSL_Integer modInvokeI(string fname, params object[] parms)
162 { 162 {
163// m_log.DebugFormat( 163// m_log.DebugFormat(
164// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 164// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
165// fname, 165// fname,
166// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 166// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
167// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 167// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
168 168
169 Type returntype = m_comms.LookupReturnType(fname); 169 Type returntype = m_comms.LookupReturnType(fname);
@@ -173,13 +173,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
173 int result = (int)modInvoke(fname,parms); 173 int result = (int)modInvoke(fname,parms);
174 return new LSL_Integer(result); 174 return new LSL_Integer(result);
175 } 175 }
176 176
177 public LSL_Float modInvokeF(string fname, params object[] parms) 177 public LSL_Float modInvokeF(string fname, params object[] parms)
178 { 178 {
179// m_log.DebugFormat( 179// m_log.DebugFormat(
180// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 180// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
181// fname, 181// fname,
182// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 182// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
183// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 183// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
184 184
185 Type returntype = m_comms.LookupReturnType(fname); 185 Type returntype = m_comms.LookupReturnType(fname);
@@ -193,9 +193,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
193 public LSL_Key modInvokeK(string fname, params object[] parms) 193 public LSL_Key modInvokeK(string fname, params object[] parms)
194 { 194 {
195// m_log.DebugFormat( 195// m_log.DebugFormat(
196// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 196// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
197// fname, 197// fname,
198// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 198// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
199// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 199// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
200 200
201 Type returntype = m_comms.LookupReturnType(fname); 201 Type returntype = m_comms.LookupReturnType(fname);
@@ -209,9 +209,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
209 public LSL_Vector modInvokeV(string fname, params object[] parms) 209 public LSL_Vector modInvokeV(string fname, params object[] parms)
210 { 210 {
211// m_log.DebugFormat( 211// m_log.DebugFormat(
212// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 212// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
213// fname, 213// fname,
214// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 214// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
215// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 215// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
216 216
217 Type returntype = m_comms.LookupReturnType(fname); 217 Type returntype = m_comms.LookupReturnType(fname);
@@ -225,9 +225,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
225 public LSL_Rotation modInvokeR(string fname, params object[] parms) 225 public LSL_Rotation modInvokeR(string fname, params object[] parms)
226 { 226 {
227// m_log.DebugFormat( 227// m_log.DebugFormat(
228// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 228// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
229// fname, 229// fname,
230// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 230// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
231// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 231// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
232 232
233 Type returntype = m_comms.LookupReturnType(fname); 233 Type returntype = m_comms.LookupReturnType(fname);
@@ -241,9 +241,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
241 public LSL_List modInvokeL(string fname, params object[] parms) 241 public LSL_List modInvokeL(string fname, params object[] parms)
242 { 242 {
243// m_log.DebugFormat( 243// m_log.DebugFormat(
244// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 244// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
245// fname, 245// fname,
246// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 246// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
247// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 247// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
248 248
249 Type returntype = m_comms.LookupReturnType(fname); 249 Type returntype = m_comms.LookupReturnType(fname);
@@ -308,22 +308,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
308 } 308 }
309 309
310// m_log.DebugFormat( 310// m_log.DebugFormat(
311// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type", 311// "[MOD API]: Invoking dynamic function {0}, args '{1}' with {2} return type",
312// fname, 312// fname,
313// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())), 313// string.Join(",", Array.ConvertAll<object, string>(parms, o => o.ToString())),
314// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType); 314// ((MethodInfo)MethodBase.GetCurrentMethod()).ReturnType);
315 315
316 Type[] signature = m_comms.LookupTypeSignature(fname); 316 Type[] signature = m_comms.LookupTypeSignature(fname);
317 if (signature.Length != parms.Length) 317 if (signature.Length != parms.Length)
318 MODError(String.Format("wrong number of parameters to function {0}",fname)); 318 MODError(String.Format("wrong number of parameters to function {0}",fname));
319 319
320 object[] convertedParms = new object[parms.Length]; 320 object[] convertedParms = new object[parms.Length];
321 for (int i = 0; i < parms.Length; i++) 321 for (int i = 0; i < parms.Length; i++)
322 convertedParms[i] = ConvertFromLSL(parms[i], signature[i], fname); 322 convertedParms[i] = ConvertFromLSL(parms[i], signature[i], fname);
323 323
324 // now call the function, the contract with the function is that it will always return 324 // now call the function, the contract with the function is that it will always return
325 // non-null but don't trust it completely 325 // non-null but don't trust it completely
326 try 326 try
327 { 327 {
328 object result = m_comms.InvokeOperation(m_host.UUID, m_item.ItemID, fname, convertedParms); 328 object result = m_comms.InvokeOperation(m_host.UUID, m_item.ItemID, fname, convertedParms);
329 if (result != null) 329 if (result != null)
@@ -342,7 +342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
342 342
343 return null; 343 return null;
344 } 344 }
345 345
346 /// <summary> 346 /// <summary>
347 /// Send a command to functions registered on an event 347 /// Send a command to functions registered on an event
348 /// </summary> 348 /// </summary>
@@ -365,7 +365,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
365 /// </summary> 365 /// </summary>
366 protected object ConvertFromLSL(object lslparm, Type type, string fname) 366 protected object ConvertFromLSL(object lslparm, Type type, string fname)
367 { 367 {
368 368
369 if(lslparm.GetType() == type) 369 if(lslparm.GetType() == type)
370 return lslparm; 370 return lslparm;
371 371
@@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
429 for (int i = 0; i < plist.Length; i++) 429 for (int i = 0; i < plist.Length; i++)
430 { 430 {
431 if (plist[i] is LSL_String) 431 if (plist[i] is LSL_String)
432 result[i] = (string)(LSL_String)plist[i]; 432 result[i] = (string)(LSL_String)plist[i];
433 else if (plist[i] is LSL_Integer) 433 else if (plist[i] is LSL_Integer)
434 result[i] = (int)(LSL_Integer)plist[i]; 434 result[i] = (int)(LSL_Integer)plist[i];
435 // The int check exists because of the many plain old int script constants in ScriptBase which 435 // The int check exists because of the many plain old int script constants in ScriptBase which
@@ -451,7 +451,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
451 return result; 451 return result;
452 } 452 }
453 } 453 }
454 454
455 MODError(String.Format("{0}: parameter type mismatch; expecting {1}, type(parm)={2}", fname, type.Name, lslparm.GetType())); 455 MODError(String.Format("{0}: parameter type mismatch; expecting {1}, type(parm)={2}", fname, type.Name, lslparm.GetType()));
456 return null; 456 return null;
457 } 457 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index ba5a46d..066f6a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
142 internal float m_ScriptDelayFactor = 1.0f; 142 internal float m_ScriptDelayFactor = 1.0f;
143 internal float m_ScriptDistanceFactor = 1.0f; 143 internal float m_ScriptDistanceFactor = 1.0f;
144 internal bool m_debuggerSafe = false; 144 internal bool m_debuggerSafe = false;
145 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); 145 internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
146 protected IUrlModule m_UrlModule = null; 146 protected IUrlModule m_UrlModule = null;
147 147
148 public void Initialize( 148 public void Initialize(
@@ -418,7 +418,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
418 //Only gods may use the function 418 //Only gods may use the function
419 if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD")) 419 if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GOD"))
420 { 420 {
421 if (World.Permissions.IsGod(ownerID)) 421 if (World.Permissions.IsGod(ownerID))
422 { 422 {
423 return String.Empty; 423 return String.Empty;
424 } 424 }
@@ -427,7 +427,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
427 //Only grid gods may use the function 427 //Only grid gods may use the function
428 if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GRID_GOD")) 428 if (m_FunctionPerms[function].AllowedOwnerClasses.Contains("GRID_GOD"))
429 { 429 {
430 if (World.Permissions.IsGridGod(ownerID)) 430 if (World.Permissions.IsGridGod(ownerID))
431 { 431 {
432 return String.Empty; 432 return String.Empty;
433 } 433 }
@@ -856,11 +856,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
856 // { 856 // {
857 857
858 // We will launch the teleport on a new thread so that when the script threads are terminated 858 // We will launch the teleport on a new thread so that when the script threads are terminated
859 // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. 859 // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
860 Util.FireAndForget( 860 Util.FireAndForget(
861 o => World.RequestTeleportLocation( 861 o => World.RequestTeleportLocation(
862 presence.ControllingClient, regionName, position, 862 presence.ControllingClient, regionName, position,
863 lookat, (uint)TPFlags.ViaLocation), 863 lookat, (uint)TPFlags.ViaLocation),
864 null, "OSSL_Api.TeleportAgentByRegionCoords"); 864 null, "OSSL_Api.TeleportAgentByRegionCoords");
865 865
866 ScriptSleep(5000); 866 ScriptSleep(5000);
@@ -906,8 +906,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
906 // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting. 906 // before teleport in ScriptInstance.GetXMLState(), we don't end up aborting the one doing the teleporting.
907 Util.FireAndForget( 907 Util.FireAndForget(
908 o => World.RequestTeleportLocation( 908 o => World.RequestTeleportLocation(
909 presence.ControllingClient, regionHandle, 909 presence.ControllingClient, regionHandle,
910 position, lookat, (uint)TPFlags.ViaLocation), 910 position, lookat, (uint)TPFlags.ViaLocation),
911 null, "OSSL_Api.TeleportAgentByRegionName"); 911 null, "OSSL_Api.TeleportAgentByRegionName");
912 912
913 ScriptSleep(5000); 913 ScriptSleep(5000);
@@ -972,13 +972,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
972 m_host.AddScriptLPS(1); 972 m_host.AddScriptLPS(1);
973 973
974 UUID targetID = new UUID(target); 974 UUID targetID = new UUID(target);
975 975
976 ForceSit(avatar, targetID); 976 ForceSit(avatar, targetID);
977 } 977 }
978 978
979 public void ForceSit(string avatar, UUID targetID) 979 public void ForceSit(string avatar, UUID targetID)
980 { 980 {
981 UUID agentID; 981 UUID agentID;
982 982
983 if (!UUID.TryParse(avatar, out agentID)) 983 if (!UUID.TryParse(avatar, out agentID))
984 return; 984 return;
@@ -1015,7 +1015,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1015 ScenePresence target = (ScenePresence)World.Entities[avatarID]; 1015 ScenePresence target = (ScenePresence)World.Entities[avatarID];
1016 return target.ControllingClient.RemoteEndPoint.Address.ToString(); 1016 return target.ControllingClient.RemoteEndPoint.Address.ToString();
1017 } 1017 }
1018 1018
1019 // fall through case, just return nothing 1019 // fall through case, just return nothing
1020 return ""; 1020 return "";
1021 } 1021 }
@@ -1058,7 +1058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1058 ScenePresence target = null; 1058 ScenePresence target = null;
1059 if ((World.Entities[avatarID] is ScenePresence)) 1059 if ((World.Entities[avatarID] is ScenePresence))
1060 target = (ScenePresence)World.Entities[avatarID]; 1060 target = (ScenePresence)World.Entities[avatarID];
1061 1061
1062 if (target == null) 1062 if (target == null)
1063 return; 1063 return;
1064 1064
@@ -1115,8 +1115,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1115 else 1115 else
1116 animID = UUID.Zero; 1116 animID = UUID.Zero;
1117 } 1117 }
1118 1118
1119 1119
1120 if (animID == UUID.Zero) 1120 if (animID == UUID.Zero)
1121 target.Animator.RemoveAnimation(animation); 1121 target.Animator.RemoveAnimation(animation);
1122 else 1122 else
@@ -1257,7 +1257,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1257 public string osSetPenColor(string drawList, string color) 1257 public string osSetPenColor(string drawList, string color)
1258 { 1258 {
1259 CheckThreatLevel(ThreatLevel.None, "osSetPenColor"); 1259 CheckThreatLevel(ThreatLevel.None, "osSetPenColor");
1260 1260
1261 m_host.AddScriptLPS(1); 1261 m_host.AddScriptLPS(1);
1262 drawList += "PenColor " + color + "; "; 1262 drawList += "PenColor " + color + "; ";
1263 return drawList; 1263 return drawList;
@@ -1780,7 +1780,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1780 } 1780 }
1781 return result; 1781 return result;
1782 } 1782 }
1783 1783
1784 private ArrayList osdToArray(OSDArray list) 1784 private ArrayList osdToArray(OSDArray list)
1785 { 1785 {
1786 ArrayList result = new ArrayList(); 1786 ArrayList result = new ArrayList();
@@ -1834,7 +1834,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1834 m_host.AddScriptLPS(1); 1834 m_host.AddScriptLPS(1);
1835 1835
1836 Object decoded = osParseJSONNew(JSON); 1836 Object decoded = osParseJSONNew(JSON);
1837 1837
1838 if ( decoded is Hashtable ) { 1838 if ( decoded is Hashtable ) {
1839 return (Hashtable) decoded; 1839 return (Hashtable) decoded;
1840 } else if ( decoded is ArrayList ) { 1840 } else if ( decoded is ArrayList ) {
@@ -1902,7 +1902,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1902 { 1902 {
1903// CheckThreatLevel(ThreatLevel.VeryHigh, "osDie"); 1903// CheckThreatLevel(ThreatLevel.VeryHigh, "osDie");
1904 // if this is restricted to objects rezzed by this host level can be reduced 1904 // if this is restricted to objects rezzed by this host level can be reduced
1905 1905
1906 CheckThreatLevel(ThreatLevel.Low, "osDie"); 1906 CheckThreatLevel(ThreatLevel.Low, "osDie");
1907 m_host.AddScriptLPS(1); 1907 m_host.AddScriptLPS(1);
1908 1908
@@ -1931,7 +1931,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1931 1931
1932 if (sceneOG.OwnerID != m_host.OwnerID) 1932 if (sceneOG.OwnerID != m_host.OwnerID)
1933 return; 1933 return;
1934 1934
1935 // harakiri check 1935 // harakiri check
1936 if(sceneOG.UUID == m_host.ParentGroup.UUID) 1936 if(sceneOG.UUID == m_host.ParentGroup.UUID)
1937 throw new SelfDeleteException(); 1937 throw new SelfDeleteException();
@@ -2042,16 +2042,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2042 if (assetID != UUID.Zero) 2042 if (assetID != UUID.Zero)
2043 { 2043 {
2044 StringBuilder notecardData = new StringBuilder(); 2044 StringBuilder notecardData = new StringBuilder();
2045 2045
2046 for (int count = 0; count < NotecardCache.GetLines(assetID); count++) 2046 for (int count = 0; count < NotecardCache.GetLines(assetID); count++)
2047 { 2047 {
2048 string line = NotecardCache.GetLine(assetID, count) + "\n"; 2048 string line = NotecardCache.GetLine(assetID, count) + "\n";
2049 2049
2050 // m_log.DebugFormat("[OSSL]: From notecard {0} loading line {1}", notecardNameOrUuid, line); 2050 // m_log.DebugFormat("[OSSL]: From notecard {0} loading line {1}", notecardNameOrUuid, line);
2051 2051
2052 notecardData.Append(line); 2052 notecardData.Append(line);
2053 } 2053 }
2054 2054
2055 return notecardData.ToString(); 2055 return notecardData.ToString();
2056 } 2056 }
2057 2057
@@ -2086,7 +2086,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2086 2086
2087 if (a == null) 2087 if (a == null)
2088 { 2088 {
2089 // Whoops, it's still possible here that the notecard name was properly 2089 // Whoops, it's still possible here that the notecard name was properly
2090 // formatted like a UUID but isn't an asset UUID so lets look it up by name after all 2090 // formatted like a UUID but isn't an asset UUID so lets look it up by name after all
2091 assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid); 2091 assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
2092 if (assetID == UUID.Zero) 2092 if (assetID == UUID.Zero)
@@ -2291,7 +2291,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2291 } 2291 }
2292 } 2292 }
2293 } 2293 }
2294 2294
2295 return ""; 2295 return "";
2296 } 2296 }
2297 2297
@@ -2429,7 +2429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2429 m_host.AddScriptLPS(1); 2429 m_host.AddScriptLPS(1);
2430 2430
2431 IConfigSource config = m_ScriptEngine.ConfigSource; 2431 IConfigSource config = m_ScriptEngine.ConfigSource;
2432 string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", 2432 string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI",
2433 new string[] { "Startup", "Hypergrid" }, String.Empty); 2433 new string[] { "Startup", "Hypergrid" }, String.Empty);
2434 2434
2435 if (!string.IsNullOrEmpty(HomeURI)) 2435 if (!string.IsNullOrEmpty(HomeURI))
@@ -2705,12 +2705,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2705 { 2705 {
2706 CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); 2706 CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
2707 m_host.AddScriptLPS(1); 2707 m_host.AddScriptLPS(1);
2708 2708
2709 // have to get the npc module also here to set the default Not Owned 2709 // have to get the npc module also here to set the default Not Owned
2710 INPCModule module = World.RequestModuleInterface<INPCModule>(); 2710 INPCModule module = World.RequestModuleInterface<INPCModule>();
2711 if(module == null) 2711 if(module == null)
2712 return new LSL_Key(UUID.Zero.ToString()); 2712 return new LSL_Key(UUID.Zero.ToString());
2713 2713
2714 bool owned = (module.NPCOptionFlags & NPCOptionsFlags.AllowNotOwned) == 0; 2714 bool owned = (module.NPCOptionFlags & NPCOptionsFlags.AllowNotOwned) == 0;
2715 2715
2716 return NpcCreate(firstname, lastname, position, notecard, owned, false, false); 2716 return NpcCreate(firstname, lastname, position, notecard, owned, false, false);
@@ -2795,7 +2795,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2795 groupTitle = "- NPC -"; 2795 groupTitle = "- NPC -";
2796 } 2796 }
2797 } 2797 }
2798 2798
2799 if((createFlags & NPCOptionsFlags.AllowCloneOtherAvatars) != 0) 2799 if((createFlags & NPCOptionsFlags.AllowCloneOtherAvatars) != 0)
2800 { 2800 {
2801 UUID id; 2801 UUID id;
@@ -2973,7 +2973,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2973 2973
2974 if (!module.CheckPermissions(npcId, m_host.OwnerID)) 2974 if (!module.CheckPermissions(npcId, m_host.OwnerID))
2975 return; 2975 return;
2976 2976
2977 module.MoveToTarget(npcId, World, pos, false, true, false); 2977 module.MoveToTarget(npcId, World, pos, false, true, false);
2978 } 2978 }
2979 } 2979 }
@@ -3202,7 +3202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3202 if (!module.CheckPermissions(npcId, m_host.OwnerID)) 3202 if (!module.CheckPermissions(npcId, m_host.OwnerID))
3203 return; 3203 return;
3204 3204
3205 module.DeleteNPC(npcId, World); 3205 module.DeleteNPC(npcId, World);
3206 } 3206 }
3207 } 3207 }
3208 catch { } 3208 catch { }
@@ -3259,7 +3259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3259 { 3259 {
3260 CheckThreatLevel(ThreatLevel.High, "osNpcTouch"); 3260 CheckThreatLevel(ThreatLevel.High, "osNpcTouch");
3261 m_host.AddScriptLPS(1); 3261 m_host.AddScriptLPS(1);
3262 3262
3263 INPCModule module = World.RequestModuleInterface<INPCModule>(); 3263 INPCModule module = World.RequestModuleInterface<INPCModule>();
3264 int linkNum = link_num.value; 3264 int linkNum = link_num.value;
3265 if (module != null || (linkNum < 0 && linkNum != ScriptBaseClass.LINK_THIS)) 3265 if (module != null || (linkNum < 0 && linkNum != ScriptBaseClass.LINK_THIS))
@@ -3400,7 +3400,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3400 bool isMale = vpShapeMale > 0.5f; 3400 bool isMale = vpShapeMale > 0.5f;
3401 return new LSL_String(isMale ? "male" : "female"); 3401 return new LSL_String(isMale ? "male" : "female");
3402 } 3402 }
3403 3403
3404 /// <summary> 3404 /// <summary>
3405 /// Get current region's map texture UUID 3405 /// Get current region's map texture UUID
3406 /// </summary> 3406 /// </summary>
@@ -3441,7 +3441,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3441 3441
3442 return key.ToString(); 3442 return key.ToString();
3443 } 3443 }
3444 3444
3445 /// <summary> 3445 /// <summary>
3446 /// Return information regarding various simulator statistics (sim fps, physics fps, time 3446 /// Return information regarding various simulator statistics (sim fps, physics fps, time
3447 /// dilation, total number of prims, total number of active scripts, script lps, various 3447 /// dilation, total number of prims, total number of active scripts, script lps, various
@@ -3455,7 +3455,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3455 m_host.AddScriptLPS(1); 3455 m_host.AddScriptLPS(1);
3456 LSL_List ret = new LSL_List(); 3456 LSL_List ret = new LSL_List();
3457 float[] stats = World.StatsReporter.LastReportedSimStats; 3457 float[] stats = World.StatsReporter.LastReportedSimStats;
3458 3458
3459 for (int i = 0; i < 21; i++) 3459 for (int i = 0; i < 21; i++)
3460 { 3460 {
3461 ret.Add(new LSL_Float(stats[i])); 3461 ret.Add(new LSL_Float(stats[i]));
@@ -3488,7 +3488,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3488 3488
3489 return (int)pws; 3489 return (int)pws;
3490 } 3490 }
3491 3491
3492 public void osSetSpeed(string UUID, LSL_Float SpeedModifier) 3492 public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
3493 { 3493 {
3494 CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); 3494 CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
@@ -3498,7 +3498,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3498 if (avatar != null) 3498 if (avatar != null)
3499 avatar.SpeedModifier = (float)SpeedModifier; 3499 avatar.SpeedModifier = (float)SpeedModifier;
3500 } 3500 }
3501 3501
3502 public void osKickAvatar(string FirstName, string SurName, string alert) 3502 public void osKickAvatar(string FirstName, string SurName, string alert)
3503 { 3503 {
3504 CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); 3504 CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
@@ -3528,7 +3528,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3528 if (presence != null) health = presence.Health; 3528 if (presence != null) health = presence.Health;
3529 return health; 3529 return health;
3530 } 3530 }
3531 3531
3532 public void osCauseDamage(string avatar, double damage) 3532 public void osCauseDamage(string avatar, double damage)
3533 { 3533 {
3534 CheckThreatLevel(ThreatLevel.High, "osCauseDamage"); 3534 CheckThreatLevel(ThreatLevel.High, "osCauseDamage");
@@ -3537,7 +3537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3537 UUID avatarId = new UUID(avatar); 3537 UUID avatarId = new UUID(avatar);
3538 Vector3 pos = m_host.GetWorldPosition(); 3538 Vector3 pos = m_host.GetWorldPosition();
3539 3539
3540 ScenePresence presence = World.GetScenePresence(avatarId); 3540 ScenePresence presence = World.GetScenePresence(avatarId);
3541 if (presence != null) 3541 if (presence != null)
3542 { 3542 {
3543 LandData land = World.GetLandData(pos); 3543 LandData land = World.GetLandData(pos);
@@ -3556,7 +3556,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3556 } 3556 }
3557 } 3557 }
3558 } 3558 }
3559 3559
3560 public void osCauseHealing(string avatar, double healing) 3560 public void osCauseHealing(string avatar, double healing)
3561 { 3561 {
3562 CheckThreatLevel(ThreatLevel.High, "osCauseHealing"); 3562 CheckThreatLevel(ThreatLevel.High, "osCauseHealing");
@@ -3625,7 +3625,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3625 CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams"); 3625 CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams");
3626 m_host.AddScriptLPS(1); 3626 m_host.AddScriptLPS(1);
3627 InitLSL(); 3627 InitLSL();
3628 3628
3629 return m_LSL_Api.GetPrimitiveParamsEx(prim, rules); 3629 return m_LSL_Api.GetPrimitiveParamsEx(prim, rules);
3630 } 3630 }
3631 3631
@@ -3634,12 +3634,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3634 CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams"); 3634 CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams");
3635 m_host.AddScriptLPS(1); 3635 m_host.AddScriptLPS(1);
3636 InitLSL(); 3636 InitLSL();
3637 3637
3638 m_LSL_Api.SetPrimitiveParamsEx(prim, rules, "osSetPrimitiveParams"); 3638 m_LSL_Api.SetPrimitiveParamsEx(prim, rules, "osSetPrimitiveParams");
3639 } 3639 }
3640 3640
3641 /// <summary> 3641 /// <summary>
3642 /// Set parameters for light projection in host prim 3642 /// Set parameters for light projection in host prim
3643 /// </summary> 3643 /// </summary>
3644 public void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb) 3644 public void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb)
3645 { 3645 {
@@ -3723,7 +3723,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3723 /// Get the description from an inventory item 3723 /// Get the description from an inventory item
3724 /// </summary> 3724 /// </summary>
3725 /// <param name="inventoryName"></param> 3725 /// <param name="inventoryName"></param>
3726 /// <returns>Item description</returns> 3726 /// <returns>Item description</returns>
3727 public LSL_String osGetInventoryDesc(string item) 3727 public LSL_String osGetInventoryDesc(string item)
3728 { 3728 {
3729 m_host.AddScriptLPS(1); 3729 m_host.AddScriptLPS(1);
@@ -3921,7 +3921,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3921 if (item.InvType != (int)InventoryType.Object) 3921 if (item.InvType != (int)InventoryType.Object)
3922 { 3922 {
3923 // FIXME: Temporary null check for regression tests since they dont' have the infrastructure to set 3923 // FIXME: Temporary null check for regression tests since they dont' have the infrastructure to set
3924 // up the api reference. 3924 // up the api reference.
3925 if (m_LSL_Api != null) 3925 if (m_LSL_Api != null)
3926 ((LSL_Api)m_LSL_Api).llSay(0, string.Format("Unable to attach, item '{0}' is not an object.", itemName)); 3926 ((LSL_Api)m_LSL_Api).llSay(0, string.Format("Unable to attach, item '{0}' is not an object.", itemName));
3927 3927
@@ -4002,10 +4002,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4002 UUID targetUUID; 4002 UUID targetUUID;
4003 if(!UUID.TryParse(avatar.ToString(), out targetUUID)) 4003 if(!UUID.TryParse(avatar.ToString(), out targetUUID))
4004 return; 4004 return;
4005 4005
4006 if(targetUUID == UUID.Zero) 4006 if(targetUUID == UUID.Zero)
4007 return; 4007 return;
4008 4008
4009 ScenePresence target; 4009 ScenePresence target;
4010 if(!World.TryGetScenePresence(targetUUID, out target)) 4010 if(!World.TryGetScenePresence(targetUUID, out target))
4011 return; 4011 return;
@@ -4068,7 +4068,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4068 return; 4068 return;
4069 } 4069 }
4070 4070
4071 bool optionObjCreator = (options & 4071 bool optionObjCreator = (options &
4072 ScriptBaseClass.OS_ATTACH_MSG_OBJECT_CREATOR) != 0; 4072 ScriptBaseClass.OS_ATTACH_MSG_OBJECT_CREATOR) != 0;
4073 bool optionScriptCreator = (options & 4073 bool optionScriptCreator = (options &
4074 ScriptBaseClass.OS_ATTACH_MSG_SCRIPT_CREATOR) != 0; 4074 ScriptBaseClass.OS_ATTACH_MSG_SCRIPT_CREATOR) != 0;
@@ -4316,7 +4316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4316 { 4316 {
4317 CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL"); 4317 CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL");
4318 m_host.AddScriptLPS(1); 4318 m_host.AddScriptLPS(1);
4319 4319
4320 Hashtable opts = new Hashtable(); 4320 Hashtable opts = new Hashtable();
4321 for (int i = 0 ; i < options.Length ; i++) 4321 for (int i = 0 ; i < options.Length ; i++)
4322 { 4322 {
@@ -4334,7 +4334,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4334 { 4334 {
4335 CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL"); 4335 CheckThreatLevel(ThreatLevel.Moderate, "osRequestSecureURL");
4336 m_host.AddScriptLPS(1); 4336 m_host.AddScriptLPS(1);
4337 4337
4338 Hashtable opts = new Hashtable(); 4338 Hashtable opts = new Hashtable();
4339 for (int i = 0 ; i < options.Length ; i++) 4339 for (int i = 0 ; i < options.Length ; i++)
4340 { 4340 {
@@ -4362,7 +4362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4362 m_host.CollisionSoundType = 0; // full return to default sounds 4362 m_host.CollisionSoundType = 0; // full return to default sounds
4363 else 4363 else
4364 m_host.CollisionSoundType = 2; // default sounds with volume 4364 m_host.CollisionSoundType = 2; // default sounds with volume
4365 m_host.aggregateScriptEvents(); 4365 m_host.aggregateScriptEvents();
4366 return; 4366 return;
4367 } 4367 }
4368 // TODO: Parameter check logic required. 4368 // TODO: Parameter check logic required.
@@ -4376,7 +4376,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4376 else 4376 else
4377 m_host.CollisionSoundType = -1; 4377 m_host.CollisionSoundType = -1;
4378 4378
4379 m_host.aggregateScriptEvents(); 4379 m_host.aggregateScriptEvents();
4380 } 4380 }
4381 4381
4382 // still not very usefull, detector is lost on rez, restarts, etc 4382 // still not very usefull, detector is lost on rez, restarts, etc
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 7bfe27b..d401ed8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -351,7 +351,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
351 // your head but the sensor will stay with your (global) 351 // your head but the sensor will stay with your (global)
352 // avatar rotation and position. 352 // avatar rotation and position.
353 // Position of a sensor in a child prim attached to an avatar 353 // Position of a sensor in a child prim attached to an avatar
354 // will be still wrong. 354 // will be still wrong.
355 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 355 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
356 356
357 // Don't proceed if the avatar for this attachment has since been removed from the scene. 357 // Don't proceed if the avatar for this attachment has since been removed from the scene.
@@ -473,7 +473,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
473 473
474 SceneObjectPart SensePoint = ts.host; 474 SceneObjectPart SensePoint = ts.host;
475 Vector3 fromRegionPos = SensePoint.GetWorldPosition(); 475 Vector3 fromRegionPos = SensePoint.GetWorldPosition();
476 476
477 Quaternion q = SensePoint.GetWorldRotation(); 477 Quaternion q = SensePoint.GetWorldRotation();
478 if (SensePoint.ParentGroup.IsAttachment) 478 if (SensePoint.ParentGroup.IsAttachment)
479 { 479 {
@@ -486,7 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
486 // your head but the sensor will stay with your (global) 486 // your head but the sensor will stay with your (global)
487 // avatar rotation and position. 487 // avatar rotation and position.
488 // Position of a sensor in a child prim attached to an avatar 488 // Position of a sensor in a child prim attached to an avatar
489 // will be still wrong. 489 // will be still wrong.
490 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar); 490 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
491 491
492 // Don't proceed if the avatar for this attachment has since been removed from the scene. 492 // Don't proceed if the avatar for this attachment has since been removed from the scene.
@@ -502,7 +502,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
502 bool attached = (SensePoint.ParentGroup.AttachmentPoint != 0); 502 bool attached = (SensePoint.ParentGroup.AttachmentPoint != 0);
503 Vector3 toRegionPos; 503 Vector3 toRegionPos;
504 double dis; 504 double dis;
505 505
506 Action<ScenePresence> senseEntity = new Action<ScenePresence>(presence => 506 Action<ScenePresence> senseEntity = new Action<ScenePresence>(presence =>
507 { 507 {
508// m_log.DebugFormat( 508// m_log.DebugFormat(
@@ -542,7 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
542 542
543 if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0) 543 if (presence.IsDeleted || presence.IsChildAgent || presence.GodLevel > 0.0)
544 return; 544 return;
545 545
546 // if the object the script is in is attached and the avatar is the owner 546 // if the object the script is in is attached and the avatar is the owner
547 // then this one is not wanted 547 // then this one is not wanted
548 if (attached && presence.UUID == SensePoint.OwnerID) 548 if (attached && presence.UUID == SensePoint.OwnerID)
@@ -700,7 +700,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
700 DateTime.Now.ToUniversalTime().AddSeconds(ts.interval); 700 DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
701 701
702 AddSenseRepeater(ts); 702 AddSenseRepeater(ts);
703 703
704 idx += 6; 704 idx += 6;
705 } 705 }
706 } 706 }
@@ -716,6 +716,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
716 } 716 }
717 717
718 return retList; 718 return retList;
719 } 719 }
720 } 720 }
721} 721}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 5b1fdc0..cae1c14 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -200,6 +200,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
200 } 200 }
201 201
202 return retList; 202 return retList;
203 } 203 }
204 } 204 }
205} 205}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
index 16805e4..e6676b4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api")] 8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs
index aa78aaa..7c518f3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IMOD_Api.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
49 LSL_Vector modInvokeV(string fname, params object[] parms); 49 LSL_Vector modInvokeV(string fname, params object[] parms);
50 LSL_Rotation modInvokeR(string fname, params object[] parms); 50 LSL_Rotation modInvokeR(string fname, params object[] parms);
51 LSL_List modInvokeL(string fname, params object[] parms); 51 LSL_List modInvokeL(string fname, params object[] parms);
52 52
53 //Module functions 53 //Module functions
54 string modSendCommand(string modules, string command, string k); 54 string modSendCommand(string modules, string command, string k);
55 } 55 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 7415fea..bee060a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
54 NoAccess = -1, 54 NoAccess = -1,
55 55
56 /// <summary> 56 /// <summary>
57 /// Function is no threat at all. It doesn't constitute a threat to 57 /// Function is no threat at all. It doesn't constitute a threat to
58 /// either users or the system and has no known side effects. 58 /// either users or the system and has no known side effects.
59 /// </summary> 59 /// </summary>
60 None = 0, 60 None = 0,
@@ -66,7 +66,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
66 Nuisance = 1, 66 Nuisance = 1,
67 67
68 /// <summary> 68 /// <summary>
69 /// Extreme levels of abuse of this function can cause impaired 69 /// Extreme levels of abuse of this function can cause impaired
70 /// functioning of the region, or very gullible users can be tricked 70 /// functioning of the region, or very gullible users can be tricked
71 /// into experiencing harmless effects. 71 /// into experiencing harmless effects.
72 /// </summary> 72 /// </summary>
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
81 81
82 /// <summary> 82 /// <summary>
83 /// Intentional abuse can cause denial of service and crashes with 83 /// Intentional abuse can cause denial of service and crashes with
84 /// potential of data or state loss; or trusting users can be tricked 84 /// potential of data or state loss; or trusting users can be tricked
85 /// into embarrassing or uncomfortable situations. 85 /// into embarrassing or uncomfortable situations.
86 /// </summary> 86 /// </summary>
87 Moderate = 4, 87 Moderate = 4,
@@ -145,7 +145,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
145 // Avatar Info Commands 145 // Avatar Info Commands
146 string osGetAgentIP(string agent); 146 string osGetAgentIP(string agent);
147 LSL_List osGetAgents(); 147 LSL_List osGetAgents();
148 148
149 // Teleport commands 149 // Teleport commands
150 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 150 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
151 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 151 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 903b362..3a90c77 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -746,7 +746,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
746 public const int FRICTION = 2; 746 public const int FRICTION = 2;
747 public const int RESTITUTION = 4; 747 public const int RESTITUTION = 4;
748 public const int GRAVITY_MULTIPLIER = 8; 748 public const int GRAVITY_MULTIPLIER = 8;
749 749
750 // extra constants for llSetPrimMediaParams 750 // extra constants for llSetPrimMediaParams
751 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); 751 public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0);
752 public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000); 752 public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 9d36341..1a42c3a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1580,7 +1580,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1580 m_LSL_Functions.llSetVelocity(force, local); 1580 m_LSL_Functions.llSetVelocity(force, local);
1581 } 1581 }
1582 1582
1583 1583
1584 public void llSetAngularVelocity(LSL_Vector force, int local) 1584 public void llSetAngularVelocity(LSL_Vector force, int local)
1585 { 1585 {
1586 m_LSL_Functions.llSetAngularVelocity(force, local); 1586 m_LSL_Functions.llSetAngularVelocity(force, local);
@@ -1995,7 +1995,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1995 { 1995 {
1996 return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); 1996 return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2);
1997 } 1997 }
1998 1998
1999 public LSL_List llGetPrimMediaParams(int face, LSL_List rules) 1999 public LSL_List llGetPrimMediaParams(int face, LSL_List rules)
2000 { 2000 {
2001 return m_LSL_Functions.llGetPrimMediaParams(face, rules); 2001 return m_LSL_Functions.llGetPrimMediaParams(face, rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index c34ccd0..6164734 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -539,7 +539,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
539 { 539 {
540 return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start); 540 return m_OSSL_Functions.osReplaceString(src,pattern,replace,count,start);
541 } 541 }
542 542
543 543
544 // Information about data loaded into the region 544 // Information about data loaded into the region
545 public string osLoadedCreationDate() 545 public string osLoadedCreationDate()
@@ -914,7 +914,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
914 { 914 {
915 return m_OSSL_Functions.osGetRegionMapTexture(regionName); 915 return m_OSSL_Functions.osGetRegionMapTexture(regionName);
916 } 916 }
917 917
918 public LSL_List osGetRegionStats() 918 public LSL_List osGetRegionStats()
919 { 919 {
920 return m_OSSL_Functions.osGetRegionStats(); 920 return m_OSSL_Functions.osGetRegionStats();
@@ -934,12 +934,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
934 { 934 {
935 return m_OSSL_Functions.osGetSimulatorMemory(); 935 return m_OSSL_Functions.osGetSimulatorMemory();
936 } 936 }
937 937
938 public void osKickAvatar(string FirstName,string SurName,string alert) 938 public void osKickAvatar(string FirstName,string SurName,string alert)
939 { 939 {
940 m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); 940 m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert);
941 } 941 }
942 942
943 public void osSetSpeed(string UUID, LSL_Float SpeedModifier) 943 public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
944 { 944 {
945 m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); 945 m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier);
@@ -954,7 +954,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
954 { 954 {
955 m_OSSL_Functions.osCauseDamage(avatar, damage); 955 m_OSSL_Functions.osCauseDamage(avatar, damage);
956 } 956 }
957 957
958 public void osCauseHealing(string avatar, double healing) 958 public void osCauseHealing(string avatar, double healing)
959 { 959 {
960 m_OSSL_Functions.osCauseHealing(avatar, healing); 960 m_OSSL_Functions.osCauseHealing(avatar, healing);
@@ -984,12 +984,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
984 { 984 {
985 m_OSSL_Functions.osForceOtherSit(avatar, target); 985 m_OSSL_Functions.osForceOtherSit(avatar, target);
986 } 986 }
987 987
988 public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules) 988 public LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules)
989 { 989 {
990 return m_OSSL_Functions.osGetPrimitiveParams(prim, rules); 990 return m_OSSL_Functions.osGetPrimitiveParams(prim, rules);
991 } 991 }
992 992
993 public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules) 993 public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules)
994 { 994 {
995 m_OSSL_Functions.osSetPrimitiveParams(prim, rules); 995 m_OSSL_Functions.osSetPrimitiveParams(prim, rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs
index b1825ac..81020f1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api.Runtime")] 8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Api.Runtime")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index bc6ce4f..031f00a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -433,9 +433,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
433 if (m_insertCoopTerminationChecks) 433 if (m_insertCoopTerminationChecks)
434 { 434 {
435 // We have to check in event functions as well because the user can manually call these. 435 // We have to check in event functions as well because the user can manually call these.
436 if (previousSymbol is GlobalFunctionDefinition 436 if (previousSymbol is GlobalFunctionDefinition
437 || previousSymbol is WhileStatement 437 || previousSymbol is WhileStatement
438 || previousSymbol is DoWhileStatement 438 || previousSymbol is DoWhileStatement
439 || previousSymbol is ForLoop 439 || previousSymbol is ForLoop
440 || previousSymbol is StateEvent) 440 || previousSymbol is StateEvent)
441 GenerateIndentedLine(m_coopTerminationCheck, sb); 441 GenerateIndentedLine(m_coopTerminationCheck, sb);
@@ -474,8 +474,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
474 { 474 {
475 // A non-braced single line do while structure cannot contain multiple statements. 475 // A non-braced single line do while structure cannot contain multiple statements.
476 // So to insert the termination check we change this to a braced control structure instead. 476 // So to insert the termination check we change this to a braced control structure instead.
477 if (previousSymbol is WhileStatement 477 if (previousSymbol is WhileStatement
478 || previousSymbol is DoWhileStatement 478 || previousSymbol is DoWhileStatement
479 || previousSymbol is ForLoop) 479 || previousSymbol is ForLoop)
480 { 480 {
481 transformToBlock = true; 481 transformToBlock = true;
@@ -530,7 +530,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
530 // This code checks for LSL of the following forms, and generates a 530 // This code checks for LSL of the following forms, and generates a
531 // warning if it finds them. 531 // warning if it finds them.
532 // 532 //
533 // list l = [ "foo" ]; 533 // list l = [ "foo" ];
534 // l = (l=[]) + l + ["bar"]; 534 // l = (l=[]) + l + ["bar"];
535 // (produces l=["foo","bar"] in SL but l=["bar"] in OS) 535 // (produces l=["foo","bar"] in SL but l=["bar"] in OS)
536 // 536 //
@@ -758,7 +758,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
758 for (int i = 0; i < fls.kids.Count; i++) 758 for (int i = 0; i < fls.kids.Count; i++)
759 { 759 {
760 SYMBOL s = (SYMBOL)fls.kids[i]; 760 SYMBOL s = (SYMBOL)fls.kids[i];
761 761
762 // Statements surrounded by parentheses in for loops 762 // Statements surrounded by parentheses in for loops
763 // 763 //
764 // e.g. for ((i = 0), (j = 7); (i < 10); (++i)) 764 // e.g. for ((i = 0), (j = 7); (i < 10); (++i))
@@ -774,7 +774,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
774 // like it would be considerably more complicated to handle). 774 // like it would be considerably more complicated to handle).
775 while (s is ParenthesisExpression) 775 while (s is ParenthesisExpression)
776 s = (SYMBOL)s.kids.Pop(); 776 s = (SYMBOL)s.kids.Pop();
777 777
778 GenerateNodeToSB(fls, s, sb); 778 GenerateNodeToSB(fls, s, sb);
779 if (0 < comma--) 779 if (0 < comma--)
780 Generate(", ", sb); 780 Generate(", ", sb);
@@ -891,9 +891,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
891 else if (value is OpenMetaverse.Quaternion) 891 else if (value is OpenMetaverse.Quaternion)
892 retval = String.Format("new LSL_Types.Quaternion(\"{0}\")",((OpenMetaverse.Quaternion)value).ToString()); 892 retval = String.Format("new LSL_Types.Quaternion(\"{0}\")",((OpenMetaverse.Quaternion)value).ToString());
893 else retval = id; 893 else retval = id;
894 894
895 Generate(retval, s, sb); 895 Generate(retval, s, sb);
896 return; 896 return;
897 } 897 }
898 } 898 }
899 899
@@ -911,7 +911,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
911 string modinvoke = null; 911 string modinvoke = null;
912 if (m_comms != null) 912 if (m_comms != null)
913 modinvoke = m_comms.LookupModInvocation(fc.Id); 913 modinvoke = m_comms.LookupModInvocation(fc.Id);
914 914
915 if (modinvoke != null) 915 if (modinvoke != null)
916 { 916 {
917 if (fc.kids[0] is ArgumentList) 917 if (fc.kids[0] is ArgumentList)
@@ -926,7 +926,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
926 { 926 {
927 Generate(String.Format("{0}(", CheckName(fc.Id)), fc, sb); 927 Generate(String.Format("{0}(", CheckName(fc.Id)), fc, sb);
928 } 928 }
929 929
930 foreach (SYMBOL kid in fc.kids) 930 foreach (SYMBOL kid in fc.kids)
931 GenerateNodeToSB(fc, kid, sb); 931 GenerateNodeToSB(fc, kid, sb);
932 932
@@ -1124,7 +1124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
1124 { 1124 {
1125 Indent(sb); 1125 Indent(sb);
1126 sb.Append(s); 1126 sb.Append(s);
1127 1127
1128 if (null != sym) 1128 if (null != sym)
1129 m_positionMap.Add(new KeyValuePair<int, int>(m_CSharpLine, m_CSharpCol), new KeyValuePair<int, int>(sym.Line, sym.Position)); 1129 m_positionMap.Add(new KeyValuePair<int, int>(m_CSharpLine, m_CSharpCol), new KeyValuePair<int, int>(sym.Line, sym.Position));
1130 1130
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs
index 7a2a4a0..19a248f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSReservedWords.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
84 if (word.StartsWith("ll")) return false; 84 if (word.StartsWith("ll")) return false;
85 char first = word.ToCharArray(0,1)[0]; 85 char first = word.ToCharArray(0,1)[0];
86 if (first >= 'A' && first <= 'Z') return false; 86 if (first >= 'A' && first <= 'Z') return false;
87 87
88 return (reservedWords.BinarySearch(word) >= 0); 88 return (reservedWords.BinarySearch(word) >= 0);
89 } 89 }
90 } 90 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index f632cb0..f3b8e1d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
119 { 119 {
120 in_startup = false; 120 in_startup = false;
121 CheckOrCreateScriptsDirectory(); 121 CheckOrCreateScriptsDirectory();
122 122
123 // First time we start? Delete old files 123 // First time we start? Delete old files
124 if (DeleteScriptsOnStartup) 124 if (DeleteScriptsOnStartup)
125 DeleteOldFiles(); 125 DeleteOldFiles();
@@ -310,9 +310,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
310 { 310 {
311// m_log.DebugFormat("[Compiler]: Found existing assembly {0} for asset {1} in {2}", assembly, asset, m_scriptEngine.World.Name); 311// m_log.DebugFormat("[Compiler]: Found existing assembly {0} for asset {1} in {2}", assembly, asset, m_scriptEngine.World.Name);
312 312
313 // If we have already read this linemap file, then it will be in our dictionary. 313 // If we have already read this linemap file, then it will be in our dictionary.
314 // Don't build another copy of the dictionary (saves memory) and certainly 314 // Don't build another copy of the dictionary (saves memory) and certainly
315 // don't keep reading the same file from disk multiple times. 315 // don't keep reading the same file from disk multiple times.
316 if (!m_lineMaps.ContainsKey(assembly)) 316 if (!m_lineMaps.ContainsKey(assembly))
317 m_lineMaps[assembly] = ReadMapFile(assembly + ".map"); 317 m_lineMaps[assembly] = ReadMapFile(assembly + ".map");
318 linemap = m_lineMaps[assembly]; 318 linemap = m_lineMaps[assembly];
@@ -366,8 +366,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
366 366
367 LSL_Converter = (ICodeConverter)new CSCodeGenerator(comms, m_insertCoopTerminationCalls); 367 LSL_Converter = (ICodeConverter)new CSCodeGenerator(comms, m_insertCoopTerminationCalls);
368 AddCSScriptHeader( 368 AddCSScriptHeader(
369 m_scriptEngine.ScriptClassName, 369 m_scriptEngine.ScriptClassName,
370 m_scriptEngine.ScriptBaseClassName, 370 m_scriptEngine.ScriptBaseClassName,
371 m_scriptEngine.ScriptBaseClassParameters, 371 m_scriptEngine.ScriptBaseClassParameters,
372 sb); 372 sb);
373 373
@@ -381,20 +381,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
381 } 381 }
382 382
383 linemap = ((CSCodeGenerator)LSL_Converter).PositionMap; 383 linemap = ((CSCodeGenerator)LSL_Converter).PositionMap;
384 // Write the linemap to a file and save it in our dictionary for next time. 384 // Write the linemap to a file and save it in our dictionary for next time.
385 m_lineMaps[assembly] = linemap; 385 m_lineMaps[assembly] = linemap;
386 WriteMapFile(assembly + ".map", linemap); 386 WriteMapFile(assembly + ".map", linemap);
387 LSL_Converter.Clear(); 387 LSL_Converter.Clear();
388 } 388 }
389 else 389 else
390 { 390 {
391 switch (language) 391 switch (language)
392 { 392 {
393 case enumCompileType.cs: 393 case enumCompileType.cs:
394 compileScript = CreateCSCompilerScript( 394 compileScript = CreateCSCompilerScript(
395 compileScript, 395 compileScript,
396 m_scriptEngine.ScriptClassName, 396 m_scriptEngine.ScriptClassName,
397 m_scriptEngine.ScriptBaseClassName, 397 m_scriptEngine.ScriptBaseClassName,
398 m_scriptEngine.ScriptBaseClassParameters); 398 m_scriptEngine.ScriptBaseClassParameters);
399 break; 399 break;
400 case enumCompileType.vb: 400 case enumCompileType.vb:
@@ -434,22 +434,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
434 public static void AddCSScriptHeader(string className, string baseClassName, ParameterInfo[] constructorParameters, StringBuilder sb) 434 public static void AddCSScriptHeader(string className, string baseClassName, ParameterInfo[] constructorParameters, StringBuilder sb)
435 { 435 {
436 sb.Append(string.Format( 436 sb.Append(string.Format(
437@"using OpenSim.Region.ScriptEngine.Shared; 437@"using OpenSim.Region.ScriptEngine.Shared;
438using System.Collections.Generic; 438using System.Collections.Generic;
439 439
440namespace SecondLife 440namespace SecondLife
441{{ 441{{
442 public class {0} : {1} 442 public class {0} : {1}
443 {{ 443 {{
444 public {0}({2}) : base({3}) {{}} 444 public {0}({2}) : base({3}) {{}}
445", 445",
446 className, 446 className,
447 baseClassName, 447 baseClassName,
448 constructorParameters != null 448 constructorParameters != null
449 ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.ToString())) 449 ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.ToString()))
450 : "", 450 : "",
451 constructorParameters != null 451 constructorParameters != null
452 ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.Name)) 452 ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.Name))
453 : "" 453 : ""
454 )); 454 ));
455 } 455 }
@@ -462,26 +462,26 @@ namespace SecondLife
462 public static string CreateCSCompilerScript( 462 public static string CreateCSCompilerScript(
463 string compileScript, string className, string baseClassName, ParameterInfo[] constructorParameters) 463 string compileScript, string className, string baseClassName, ParameterInfo[] constructorParameters)
464 { 464 {
465 compileScript = string.Format( 465 compileScript = string.Format(
466@"using OpenSim.Region.ScriptEngine.Shared; 466@"using OpenSim.Region.ScriptEngine.Shared;
467using System.Collections.Generic; 467using System.Collections.Generic;
468 468
469namespace SecondLife 469namespace SecondLife
470{{ 470{{
471 public class {0} : {1} 471 public class {0} : {1}
472 {{ 472 {{
473 public {0}({2}) : base({3}) {{}} 473 public {0}({2}) : base({3}) {{}}
474{4} 474{4}
475 }} 475 }}
476}}", 476}}",
477 className, 477 className,
478 baseClassName, 478 baseClassName,
479 constructorParameters != null 479 constructorParameters != null
480 ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.ToString())) 480 ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.ToString()))
481 : "", 481 : "",
482 constructorParameters != null 482 constructorParameters != null
483 ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.Name)) 483 ? string.Join(", ", Array.ConvertAll<ParameterInfo, string>(constructorParameters, pi => pi.Name))
484 : "", 484 : "",
485 compileScript); 485 compileScript);
486 486
487 return compileScript; 487 return compileScript;
@@ -508,7 +508,7 @@ namespace SecondLife
508 internal string CompileFromDotNetText(string Script, enumCompileType lang, string asset, string assembly) 508 internal string CompileFromDotNetText(string Script, enumCompileType lang, string asset, string assembly)
509 { 509 {
510// m_log.DebugFormat("[Compiler]: Compiling to assembly\n{0}", Script); 510// m_log.DebugFormat("[Compiler]: Compiling to assembly\n{0}", Script);
511 511
512 string ext = "." + lang.ToString(); 512 string ext = "." + lang.ToString();
513 513
514 // Output assembly name 514 // Output assembly name
@@ -562,7 +562,7 @@ namespace SecondLife
562 562
563 if (m_scriptEngine.ScriptReferencedAssemblies != null) 563 if (m_scriptEngine.ScriptReferencedAssemblies != null)
564 Array.ForEach<string>( 564 Array.ForEach<string>(
565 m_scriptEngine.ScriptReferencedAssemblies, 565 m_scriptEngine.ScriptReferencedAssemblies,
566 a => parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, a))); 566 a => parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, a)));
567 567
568 parameters.GenerateExecutable = false; 568 parameters.GenerateExecutable = false;
@@ -571,7 +571,7 @@ namespace SecondLife
571 //parameters.WarningLevel = 1; // Should be 4? 571 //parameters.WarningLevel = 1; // Should be 4?
572 parameters.TreatWarningsAsErrors = false; 572 parameters.TreatWarningsAsErrors = false;
573 parameters.GenerateInMemory = false; 573 parameters.GenerateInMemory = false;
574 574
575 CompilerResults results; 575 CompilerResults results;
576 576
577 CodeDomProvider provider; 577 CodeDomProvider provider;
@@ -605,7 +605,7 @@ namespace SecondLife
605// results = CScodeProvider.CompileAssemblyFromSource( 605// results = CScodeProvider.CompileAssemblyFromSource(
606// parameters, Script); 606// parameters, Script);
607// } 607// }
608 608
609 results = provider.CompileAssemblyFromSource( 609 results = provider.CompileAssemblyFromSource(
610 parameters, Script); 610 parameters, Script);
611 // Deal with an occasional segv in the compiler. 611 // Deal with an occasional segv in the compiler.
@@ -685,14 +685,14 @@ namespace SecondLife
685 } 685 }
686 686
687 provider.Dispose(); 687 provider.Dispose();
688 688
689 if (hadErrors) 689 if (hadErrors)
690 { 690 {
691 throw new Exception(errtext); 691 throw new Exception(errtext);
692 } 692 }
693 693
694 // On today's highly asynchronous systems, the result of 694 // On today's highly asynchronous systems, the result of
695 // the compile may not be immediately apparent. Wait a 695 // the compile may not be immediately apparent. Wait a
696 // reasonable amount of time before giving up on it. 696 // reasonable amount of time before giving up on it.
697 697
698 if (!File.Exists(assembly)) 698 if (!File.Exists(assembly))
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
index 7966f59..304cd81 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.CodeTools")] 8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.CodeTools")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
index ad4ccf0..12ba4de 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
81 m_resolveEventHandler = new ResolveEventHandler(AssemblyResolver.OnAssemblyResolve); 81 m_resolveEventHandler = new ResolveEventHandler(AssemblyResolver.OnAssemblyResolve);
82 82
83 System.AppDomain.CurrentDomain.AssemblyResolve += m_resolveEventHandler; 83 System.AppDomain.CurrentDomain.AssemblyResolve += m_resolveEventHandler;
84 84
85 m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll")); 85 m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll"));
86 m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); 86 m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll"));
87 m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll")); 87 m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll"));
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
112 CSCodeGenerator cg = new CSCodeGenerator(); 112 CSCodeGenerator cg = new CSCodeGenerator();
113 string output = cg.Convert(input); 113 string output = cg.Convert(input);
114 114
115 output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null); 115 output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null);
116 // System.Console.WriteLine(output); 116 // System.Console.WriteLine(output);
117 117
118 positionMap = cg.PositionMap; 118 positionMap = cg.PositionMap;
@@ -154,7 +154,7 @@ erros position is better tested on viewers
154 @l; 154 @l;
155 i = 1; 155 i = 1;
156 } 156 }
157}", out positionMap); 157}", out positionMap);
158 158
159 Assert.AreEqual( 159 Assert.AreEqual(
160 new KeyValuePair<int, int>(7, 9), 160 new KeyValuePair<int, int>(7, 9),
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 67ce10a..220ec72 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
150// TestHelpers.EnableLogging(); 150// TestHelpers.EnableLogging();
151 151
152 TestIntArgEvent("changed"); 152 TestIntArgEvent("changed");
153 } 153 }
154 154
155 [Test] 155 [Test]
156 public void TestCollisionEvent() 156 public void TestCollisionEvent()
@@ -159,7 +159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
159// TestHelpers.EnableLogging(); 159// TestHelpers.EnableLogging();
160 160
161 TestIntArgEvent("collision"); 161 TestIntArgEvent("collision");
162 } 162 }
163 163
164 [Test] 164 [Test]
165 public void TestCollisionStartEvent() 165 public void TestCollisionStartEvent()
@@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
168// TestHelpers.EnableLogging(); 168// TestHelpers.EnableLogging();
169 169
170 TestIntArgEvent("collision_start"); 170 TestIntArgEvent("collision_start");
171 } 171 }
172 172
173 [Test] 173 [Test]
174 public void TestCollisionEndEvent() 174 public void TestCollisionEndEvent()
@@ -177,7 +177,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
177// TestHelpers.EnableLogging(); 177// TestHelpers.EnableLogging();
178 178
179 TestIntArgEvent("collision_end"); 179 TestIntArgEvent("collision_end");
180 } 180 }
181 181
182 [Test] 182 [Test]
183 public void TestOnRezEvent() 183 public void TestOnRezEvent()
@@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
186// TestHelpers.EnableLogging(); 186// TestHelpers.EnableLogging();
187 187
188 TestIntArgEvent("on_rez"); 188 TestIntArgEvent("on_rez");
189 } 189 }
190 190
191 [Test] 191 [Test]
192 public void TestRunTimePermissionsEvent() 192 public void TestRunTimePermissionsEvent()
@@ -195,7 +195,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
195// TestHelpers.EnableLogging(); 195// TestHelpers.EnableLogging();
196 196
197 TestIntArgEvent("run_time_permissions"); 197 TestIntArgEvent("run_time_permissions");
198 } 198 }
199 199
200 [Test] 200 [Test]
201 public void TestSensorEvent() 201 public void TestSensorEvent()
@@ -204,7 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
204// TestHelpers.EnableLogging(); 204// TestHelpers.EnableLogging();
205 205
206 TestIntArgEvent("sensor"); 206 TestIntArgEvent("sensor");
207 } 207 }
208 208
209 [Test] 209 [Test]
210 public void TestTouchEvent() 210 public void TestTouchEvent()
@@ -213,7 +213,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
213// TestHelpers.EnableLogging(); 213// TestHelpers.EnableLogging();
214 214
215 TestIntArgEvent("touch"); 215 TestIntArgEvent("touch");
216 } 216 }
217 217
218 [Test] 218 [Test]
219 public void TestTouchStartEvent() 219 public void TestTouchStartEvent()
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
222// TestHelpers.EnableLogging(); 222// TestHelpers.EnableLogging();
223 223
224 TestIntArgEvent("touch_start"); 224 TestIntArgEvent("touch_start");
225 } 225 }
226 226
227 [Test] 227 [Test]
228 public void TestTouchEndEvent() 228 public void TestTouchEndEvent()
@@ -231,7 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
231// TestHelpers.EnableLogging(); 231// TestHelpers.EnableLogging();
232 232
233 TestIntArgEvent("touch_end"); 233 TestIntArgEvent("touch_end");
234 } 234 }
235 235
236 [Test] 236 [Test]
237 public void TestLandCollisionEvent() 237 public void TestLandCollisionEvent()
@@ -351,8 +351,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
351 } 351 }
352 352
353 Assert.That( 353 Assert.That(
354 gotException, 354 gotException,
355 Is.EqualTo(expectException), 355 Is.EqualTo(expectException),
356 "Failed on {0}, exception {1}", script, ge != null ? ge.ToString() : "n/a"); 356 "Failed on {0}, exception {1}", script, ge != null ? ge.ToString() : "n/a");
357 } 357 }
358 } 358 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
index f87f446..66210b7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs
@@ -379,7 +379,7 @@ public override int yynum { get { return 96; }}
379 public FLOAT_CONSTANT(Lexer yyl):base(yyl) {}} 379 public FLOAT_CONSTANT(Lexer yyl):base(yyl) {}}
380//%|LSLTokens 380//%|LSLTokens
381public class yyLSLTokens : YyLexer { 381public class yyLSLTokens : YyLexer {
382 public yyLSLTokens(ErrorHandler eh):base(eh) { arr = new int[] { 382 public yyLSLTokens(ErrorHandler eh):base(eh) { arr = new int[] {
383101,4,6,52,0, 383101,4,6,52,0,
38446,0,53,0,6, 38446,0,53,0,6,
385102,4,16,117,0, 385102,4,16,117,0,
@@ -19717,13 +19717,13 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool
19717 break; 19717 break;
19718 case 1063: ; 19718 case 1063: ;
19719 break; 19719 break;
19720 case 1076: ; 19720 case 1076: ;
19721 break; 19721 break;
19722 case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } 19722 case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); }
19723 break; 19723 break;
19724 case 1067: ; 19724 case 1067: ;
19725 break; 19725 break;
19726 case 1072: ; 19726 case 1072: ;
19727 break; 19727 break;
19728 case 1003: { ((LSLTokens)yym).str += "\\\""; } 19728 case 1003: { ((LSLTokens)yym).str += "\\\""; }
19729 break; 19729 break;
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
index 5fef83c..e4b5891 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.parser.cs
@@ -886,1493 +886,1493 @@ public IncrementDecrementExpression(Parser yyp):base(yyp){}}
886 886
887public class LSLProgramRoot_1 : LSLProgramRoot { 887public class LSLProgramRoot_1 : LSLProgramRoot {
888 public LSLProgramRoot_1(Parser yyq):base(yyq, 888 public LSLProgramRoot_1(Parser yyq):base(yyq,
889 ((GlobalDefinitions)(yyq.StackAt(1).m_value)) 889 ((GlobalDefinitions)(yyq.StackAt(1).m_value))
890 , 890 ,
891 ((States)(yyq.StackAt(0).m_value)) 891 ((States)(yyq.StackAt(0).m_value))
892 ){}} 892 ){}}
893 893
894public class LSLProgramRoot_2 : LSLProgramRoot { 894public class LSLProgramRoot_2 : LSLProgramRoot {
895 public LSLProgramRoot_2(Parser yyq):base(yyq, 895 public LSLProgramRoot_2(Parser yyq):base(yyq,
896 ((States)(yyq.StackAt(0).m_value)) 896 ((States)(yyq.StackAt(0).m_value))
897 ){}} 897 ){}}
898 898
899public class GlobalDefinitions_1 : GlobalDefinitions { 899public class GlobalDefinitions_1 : GlobalDefinitions {
900 public GlobalDefinitions_1(Parser yyq):base(yyq, 900 public GlobalDefinitions_1(Parser yyq):base(yyq,
901 ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) 901 ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value))
902 ){}} 902 ){}}
903 903
904public class GlobalDefinitions_2 : GlobalDefinitions { 904public class GlobalDefinitions_2 : GlobalDefinitions {
905 public GlobalDefinitions_2(Parser yyq):base(yyq, 905 public GlobalDefinitions_2(Parser yyq):base(yyq,
906 ((GlobalDefinitions)(yyq.StackAt(1).m_value)) 906 ((GlobalDefinitions)(yyq.StackAt(1).m_value))
907 , 907 ,
908 ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) 908 ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value))
909 ){}} 909 ){}}
910 910
911public class GlobalDefinitions_3 : GlobalDefinitions { 911public class GlobalDefinitions_3 : GlobalDefinitions {
912 public GlobalDefinitions_3(Parser yyq):base(yyq, 912 public GlobalDefinitions_3(Parser yyq):base(yyq,
913 ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) 913 ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value))
914 ){}} 914 ){}}
915 915
916public class GlobalDefinitions_4 : GlobalDefinitions { 916public class GlobalDefinitions_4 : GlobalDefinitions {
917 public GlobalDefinitions_4(Parser yyq):base(yyq, 917 public GlobalDefinitions_4(Parser yyq):base(yyq,
918 ((GlobalDefinitions)(yyq.StackAt(1).m_value)) 918 ((GlobalDefinitions)(yyq.StackAt(1).m_value))
919 , 919 ,
920 ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) 920 ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value))
921 ){}} 921 ){}}
922 922
923public class GlobalVariableDeclaration_1 : GlobalVariableDeclaration { 923public class GlobalVariableDeclaration_1 : GlobalVariableDeclaration {
924 public GlobalVariableDeclaration_1(Parser yyq):base(yyq, 924 public GlobalVariableDeclaration_1(Parser yyq):base(yyq,
925 ((Declaration)(yyq.StackAt(1).m_value)) 925 ((Declaration)(yyq.StackAt(1).m_value))
926 ){}} 926 ){}}
927 927
928public class GlobalVariableDeclaration_2 : GlobalVariableDeclaration { 928public class GlobalVariableDeclaration_2 : GlobalVariableDeclaration {
929 public GlobalVariableDeclaration_2(Parser yyq):base(yyq,new Assignment(((LSLSyntax 929 public GlobalVariableDeclaration_2(Parser yyq):base(yyq,new Assignment(((LSLSyntax
930)yyq), 930)yyq),
931 ((Declaration)(yyq.StackAt(3).m_value)) 931 ((Declaration)(yyq.StackAt(3).m_value))
932 , 932 ,
933 ((Expression)(yyq.StackAt(1).m_value)) 933 ((Expression)(yyq.StackAt(1).m_value))
934 , 934 ,
935 ((EQUALS)(yyq.StackAt(2).m_value)) 935 ((EQUALS)(yyq.StackAt(2).m_value))
936 .yytext)){}} 936 .yytext)){}}
937 937
938public class GlobalFunctionDefinition_1 : GlobalFunctionDefinition { 938public class GlobalFunctionDefinition_1 : GlobalFunctionDefinition {
939 public GlobalFunctionDefinition_1(Parser yyq):base(yyq,"void", 939 public GlobalFunctionDefinition_1(Parser yyq):base(yyq,"void",
940 ((IDENT)(yyq.StackAt(4).m_value)) 940 ((IDENT)(yyq.StackAt(4).m_value))
941 .yytext, 941 .yytext,
942 ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) 942 ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
943 , 943 ,
944 ((CompoundStatement)(yyq.StackAt(0).m_value)) 944 ((CompoundStatement)(yyq.StackAt(0).m_value))
945 ){}} 945 ){}}
946 946
947public class GlobalFunctionDefinition_2 : GlobalFunctionDefinition { 947public class GlobalFunctionDefinition_2 : GlobalFunctionDefinition {
948 public GlobalFunctionDefinition_2(Parser yyq):base(yyq, 948 public GlobalFunctionDefinition_2(Parser yyq):base(yyq,
949 ((Typename)(yyq.StackAt(5).m_value)) 949 ((Typename)(yyq.StackAt(5).m_value))
950 .yytext, 950 .yytext,
951 ((IDENT)(yyq.StackAt(4).m_value)) 951 ((IDENT)(yyq.StackAt(4).m_value))
952 .yytext, 952 .yytext,
953 ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) 953 ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
954 , 954 ,
955 ((CompoundStatement)(yyq.StackAt(0).m_value)) 955 ((CompoundStatement)(yyq.StackAt(0).m_value))
956 ){}} 956 ){}}
957 957
958public class States_1 : States { 958public class States_1 : States {
959 public States_1(Parser yyq):base(yyq, 959 public States_1(Parser yyq):base(yyq,
960 ((State)(yyq.StackAt(0).m_value)) 960 ((State)(yyq.StackAt(0).m_value))
961 ){}} 961 ){}}
962 962
963public class States_2 : States { 963public class States_2 : States {
964 public States_2(Parser yyq):base(yyq, 964 public States_2(Parser yyq):base(yyq,
965 ((States)(yyq.StackAt(1).m_value)) 965 ((States)(yyq.StackAt(1).m_value))
966 , 966 ,
967 ((State)(yyq.StackAt(0).m_value)) 967 ((State)(yyq.StackAt(0).m_value))
968 ){}} 968 ){}}
969 969
970public class State_1 : State { 970public class State_1 : State {
971 public State_1(Parser yyq):base(yyq, 971 public State_1(Parser yyq):base(yyq,
972 ((DEFAULT_STATE)(yyq.StackAt(3).m_value)) 972 ((DEFAULT_STATE)(yyq.StackAt(3).m_value))
973 .yytext, 973 .yytext,
974 ((StateBody)(yyq.StackAt(1).m_value)) 974 ((StateBody)(yyq.StackAt(1).m_value))
975 ){}} 975 ){}}
976 976
977public class State_2 : State { 977public class State_2 : State {
978 public State_2(Parser yyq):base(yyq, 978 public State_2(Parser yyq):base(yyq,
979 ((IDENT)(yyq.StackAt(3).m_value)) 979 ((IDENT)(yyq.StackAt(3).m_value))
980 .yytext, 980 .yytext,
981 ((StateBody)(yyq.StackAt(1).m_value)) 981 ((StateBody)(yyq.StackAt(1).m_value))
982 ){}} 982 ){}}
983 983
984public class StateBody_1 : StateBody { 984public class StateBody_1 : StateBody {
985 public StateBody_1(Parser yyq):base(yyq, 985 public StateBody_1(Parser yyq):base(yyq,
986 ((StateEvent)(yyq.StackAt(0).m_value)) 986 ((StateEvent)(yyq.StackAt(0).m_value))
987 ){}} 987 ){}}
988 988
989public class StateBody_2 : StateBody { 989public class StateBody_2 : StateBody {
990 public StateBody_2(Parser yyq):base(yyq, 990 public StateBody_2(Parser yyq):base(yyq,
991 ((StateBody)(yyq.StackAt(1).m_value)) 991 ((StateBody)(yyq.StackAt(1).m_value))
992 , 992 ,
993 ((StateEvent)(yyq.StackAt(0).m_value)) 993 ((StateEvent)(yyq.StackAt(0).m_value))
994 ){}} 994 ){}}
995 995
996public class StateBody_3 : StateBody { 996public class StateBody_3 : StateBody {
997 public StateBody_3(Parser yyq):base(yyq, 997 public StateBody_3(Parser yyq):base(yyq,
998 ((VoidArgStateEvent)(yyq.StackAt(0).m_value)) 998 ((VoidArgStateEvent)(yyq.StackAt(0).m_value))
999 ){}} 999 ){}}
1000 1000
1001public class StateBody_4 : StateBody { 1001public class StateBody_4 : StateBody {
1002 public StateBody_4(Parser yyq):base(yyq, 1002 public StateBody_4(Parser yyq):base(yyq,
1003 ((StateBody)(yyq.StackAt(1).m_value)) 1003 ((StateBody)(yyq.StackAt(1).m_value))
1004 , 1004 ,
1005 ((VoidArgStateEvent)(yyq.StackAt(0).m_value)) 1005 ((VoidArgStateEvent)(yyq.StackAt(0).m_value))
1006 ){}} 1006 ){}}
1007 1007
1008public class StateBody_5 : StateBody { 1008public class StateBody_5 : StateBody {
1009 public StateBody_5(Parser yyq):base(yyq, 1009 public StateBody_5(Parser yyq):base(yyq,
1010 ((KeyArgStateEvent)(yyq.StackAt(0).m_value)) 1010 ((KeyArgStateEvent)(yyq.StackAt(0).m_value))
1011 ){}} 1011 ){}}
1012 1012
1013public class StateBody_6 : StateBody { 1013public class StateBody_6 : StateBody {
1014 public StateBody_6(Parser yyq):base(yyq, 1014 public StateBody_6(Parser yyq):base(yyq,
1015 ((StateBody)(yyq.StackAt(1).m_value)) 1015 ((StateBody)(yyq.StackAt(1).m_value))
1016 , 1016 ,
1017 ((KeyArgStateEvent)(yyq.StackAt(0).m_value)) 1017 ((KeyArgStateEvent)(yyq.StackAt(0).m_value))
1018 ){}} 1018 ){}}
1019 1019
1020public class StateBody_7 : StateBody { 1020public class StateBody_7 : StateBody {
1021 public StateBody_7(Parser yyq):base(yyq, 1021 public StateBody_7(Parser yyq):base(yyq,
1022 ((IntArgStateEvent)(yyq.StackAt(0).m_value)) 1022 ((IntArgStateEvent)(yyq.StackAt(0).m_value))
1023 ){}} 1023 ){}}
1024 1024
1025public class StateBody_8 : StateBody { 1025public class StateBody_8 : StateBody {
1026 public StateBody_8(Parser yyq):base(yyq, 1026 public StateBody_8(Parser yyq):base(yyq,
1027 ((StateBody)(yyq.StackAt(1).m_value)) 1027 ((StateBody)(yyq.StackAt(1).m_value))
1028 , 1028 ,
1029 ((IntArgStateEvent)(yyq.StackAt(0).m_value)) 1029 ((IntArgStateEvent)(yyq.StackAt(0).m_value))
1030 ){}} 1030 ){}}
1031 1031
1032public class StateBody_9 : StateBody { 1032public class StateBody_9 : StateBody {
1033 public StateBody_9(Parser yyq):base(yyq, 1033 public StateBody_9(Parser yyq):base(yyq,
1034 ((VectorArgStateEvent)(yyq.StackAt(0).m_value)) 1034 ((VectorArgStateEvent)(yyq.StackAt(0).m_value))
1035 ){}} 1035 ){}}
1036 1036
1037public class StateBody_10 : StateBody { 1037public class StateBody_10 : StateBody {
1038 public StateBody_10(Parser yyq):base(yyq, 1038 public StateBody_10(Parser yyq):base(yyq,
1039 ((StateBody)(yyq.StackAt(1).m_value)) 1039 ((StateBody)(yyq.StackAt(1).m_value))
1040 , 1040 ,
1041 ((VectorArgStateEvent)(yyq.StackAt(0).m_value)) 1041 ((VectorArgStateEvent)(yyq.StackAt(0).m_value))
1042 ){}} 1042 ){}}
1043 1043
1044public class StateBody_11 : StateBody { 1044public class StateBody_11 : StateBody {
1045 public StateBody_11(Parser yyq):base(yyq, 1045 public StateBody_11(Parser yyq):base(yyq,
1046 ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value)) 1046 ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value))
1047 ){}} 1047 ){}}
1048 1048
1049public class StateBody_12 : StateBody { 1049public class StateBody_12 : StateBody {
1050 public StateBody_12(Parser yyq):base(yyq, 1050 public StateBody_12(Parser yyq):base(yyq,
1051 ((StateBody)(yyq.StackAt(1).m_value)) 1051 ((StateBody)(yyq.StackAt(1).m_value))
1052 , 1052 ,
1053 ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value)) 1053 ((IntRotRotArgStateEvent)(yyq.StackAt(0).m_value))
1054 ){}} 1054 ){}}
1055 1055
1056public class StateBody_13 : StateBody { 1056public class StateBody_13 : StateBody {
1057 public StateBody_13(Parser yyq):base(yyq, 1057 public StateBody_13(Parser yyq):base(yyq,
1058 ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value)) 1058 ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value))
1059 ){}} 1059 ){}}
1060 1060
1061public class StateBody_14 : StateBody { 1061public class StateBody_14 : StateBody {
1062 public StateBody_14(Parser yyq):base(yyq, 1062 public StateBody_14(Parser yyq):base(yyq,
1063 ((StateBody)(yyq.StackAt(1).m_value)) 1063 ((StateBody)(yyq.StackAt(1).m_value))
1064 , 1064 ,
1065 ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value)) 1065 ((IntVecVecArgStateEvent)(yyq.StackAt(0).m_value))
1066 ){}} 1066 ){}}
1067 1067
1068public class StateBody_15 : StateBody { 1068public class StateBody_15 : StateBody {
1069 public StateBody_15(Parser yyq):base(yyq, 1069 public StateBody_15(Parser yyq):base(yyq,
1070 ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value)) 1070 ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value))
1071 ){}} 1071 ){}}
1072 1072
1073public class StateBody_16 : StateBody { 1073public class StateBody_16 : StateBody {
1074 public StateBody_16(Parser yyq):base(yyq, 1074 public StateBody_16(Parser yyq):base(yyq,
1075 ((StateBody)(yyq.StackAt(1).m_value)) 1075 ((StateBody)(yyq.StackAt(1).m_value))
1076 , 1076 ,
1077 ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value)) 1077 ((KeyIntIntArgStateEvent)(yyq.StackAt(0).m_value))
1078 ){}} 1078 ){}}
1079 1079
1080public class StateEvent_1 : StateEvent { 1080public class StateEvent_1 : StateEvent {
1081 public StateEvent_1(Parser yyq):base(yyq, 1081 public StateEvent_1(Parser yyq):base(yyq,
1082 ((Event)(yyq.StackAt(4).m_value)) 1082 ((Event)(yyq.StackAt(4).m_value))
1083 .yytext, 1083 .yytext,
1084 ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) 1084 ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
1085 , 1085 ,
1086 ((CompoundStatement)(yyq.StackAt(0).m_value)) 1086 ((CompoundStatement)(yyq.StackAt(0).m_value))
1087 ){}} 1087 ){}}
1088 1088
1089public class VoidArgStateEvent_1 : VoidArgStateEvent { 1089public class VoidArgStateEvent_1 : VoidArgStateEvent {
1090 public VoidArgStateEvent_1(Parser yyq):base(yyq, 1090 public VoidArgStateEvent_1(Parser yyq):base(yyq,
1091 ((VoidArgEvent)(yyq.StackAt(3).m_value)) 1091 ((VoidArgEvent)(yyq.StackAt(3).m_value))
1092 .yytext, 1092 .yytext,
1093 ((CompoundStatement)(yyq.StackAt(0).m_value)) 1093 ((CompoundStatement)(yyq.StackAt(0).m_value))
1094 ){}} 1094 ){}}
1095 1095
1096public class KeyArgStateEvent_1 : KeyArgStateEvent { 1096public class KeyArgStateEvent_1 : KeyArgStateEvent {
1097 public KeyArgStateEvent_1(Parser yyq):base(yyq, 1097 public KeyArgStateEvent_1(Parser yyq):base(yyq,
1098 ((KeyArgEvent)(yyq.StackAt(4).m_value)) 1098 ((KeyArgEvent)(yyq.StackAt(4).m_value))
1099 .yytext, 1099 .yytext,
1100 ((KeyArgumentDeclarationList)(yyq.StackAt(2).m_value)) 1100 ((KeyArgumentDeclarationList)(yyq.StackAt(2).m_value))
1101 , 1101 ,
1102 ((CompoundStatement)(yyq.StackAt(0).m_value)) 1102 ((CompoundStatement)(yyq.StackAt(0).m_value))
1103 ){}} 1103 ){}}
1104 1104
1105public class IntArgStateEvent_1 : IntArgStateEvent { 1105public class IntArgStateEvent_1 : IntArgStateEvent {
1106 public IntArgStateEvent_1(Parser yyq):base(yyq, 1106 public IntArgStateEvent_1(Parser yyq):base(yyq,
1107 ((IntArgEvent)(yyq.StackAt(4).m_value)) 1107 ((IntArgEvent)(yyq.StackAt(4).m_value))
1108 .yytext, 1108 .yytext,
1109 ((IntArgumentDeclarationList)(yyq.StackAt(2).m_value)) 1109 ((IntArgumentDeclarationList)(yyq.StackAt(2).m_value))
1110 , 1110 ,
1111 ((CompoundStatement)(yyq.StackAt(0).m_value)) 1111 ((CompoundStatement)(yyq.StackAt(0).m_value))
1112 ){}} 1112 ){}}
1113 1113
1114public class VectorArgStateEvent_1 : VectorArgStateEvent { 1114public class VectorArgStateEvent_1 : VectorArgStateEvent {
1115 public VectorArgStateEvent_1(Parser yyq):base(yyq, 1115 public VectorArgStateEvent_1(Parser yyq):base(yyq,
1116 ((VectorArgEvent)(yyq.StackAt(4).m_value)) 1116 ((VectorArgEvent)(yyq.StackAt(4).m_value))
1117 .yytext, 1117 .yytext,
1118 ((VectorArgumentDeclarationList)(yyq.StackAt(2).m_value)) 1118 ((VectorArgumentDeclarationList)(yyq.StackAt(2).m_value))
1119 , 1119 ,
1120 ((CompoundStatement)(yyq.StackAt(0).m_value)) 1120 ((CompoundStatement)(yyq.StackAt(0).m_value))
1121 ){}} 1121 ){}}
1122 1122
1123public class IntRotRotArgStateEvent_1 : IntRotRotArgStateEvent { 1123public class IntRotRotArgStateEvent_1 : IntRotRotArgStateEvent {
1124 public IntRotRotArgStateEvent_1(Parser yyq):base(yyq, 1124 public IntRotRotArgStateEvent_1(Parser yyq):base(yyq,
1125 ((IntRotRotArgEvent)(yyq.StackAt(4).m_value)) 1125 ((IntRotRotArgEvent)(yyq.StackAt(4).m_value))
1126 .yytext, 1126 .yytext,
1127 ((IntRotRotArgumentDeclarationList)(yyq.StackAt(2).m_value)) 1127 ((IntRotRotArgumentDeclarationList)(yyq.StackAt(2).m_value))
1128 , 1128 ,
1129 ((CompoundStatement)(yyq.StackAt(0).m_value)) 1129 ((CompoundStatement)(yyq.StackAt(0).m_value))
1130 ){}} 1130 ){}}
1131 1131
1132public class IntVecVecArgStateEvent_1 : IntVecVecArgStateEvent { 1132public class IntVecVecArgStateEvent_1 : IntVecVecArgStateEvent {
1133 public IntVecVecArgStateEvent_1(Parser yyq):base(yyq, 1133 public IntVecVecArgStateEvent_1(Parser yyq):base(yyq,
1134 ((IntVecVecArgEvent)(yyq.StackAt(4).m_value)) 1134 ((IntVecVecArgEvent)(yyq.StackAt(4).m_value))
1135 .yytext, 1135 .yytext,
1136 ((IntVecVecArgumentDeclarationList)(yyq.StackAt(2).m_value)) 1136 ((IntVecVecArgumentDeclarationList)(yyq.StackAt(2).m_value))
1137 , 1137 ,
1138 ((CompoundStatement)(yyq.StackAt(0).m_value)) 1138 ((CompoundStatement)(yyq.StackAt(0).m_value))
1139 ){}} 1139 ){}}
1140 1140
1141public class KeyIntIntArgStateEvent_1 : KeyIntIntArgStateEvent { 1141public class KeyIntIntArgStateEvent_1 : KeyIntIntArgStateEvent {
1142 public KeyIntIntArgStateEvent_1(Parser yyq):base(yyq, 1142 public KeyIntIntArgStateEvent_1(Parser yyq):base(yyq,
1143 ((KeyIntIntArgEvent)(yyq.StackAt(4).m_value)) 1143 ((KeyIntIntArgEvent)(yyq.StackAt(4).m_value))
1144 .yytext, 1144 .yytext,
1145 ((KeyIntIntArgumentDeclarationList)(yyq.StackAt(2).m_value)) 1145 ((KeyIntIntArgumentDeclarationList)(yyq.StackAt(2).m_value))
1146 , 1146 ,
1147 ((CompoundStatement)(yyq.StackAt(0).m_value)) 1147 ((CompoundStatement)(yyq.StackAt(0).m_value))
1148 ){}} 1148 ){}}
1149 1149
1150public class ArgumentDeclarationList_1 : ArgumentDeclarationList { 1150public class ArgumentDeclarationList_1 : ArgumentDeclarationList {
1151 public ArgumentDeclarationList_1(Parser yyq):base(yyq, 1151 public ArgumentDeclarationList_1(Parser yyq):base(yyq,
1152 ((Declaration)(yyq.StackAt(0).m_value)) 1152 ((Declaration)(yyq.StackAt(0).m_value))
1153 ){}} 1153 ){}}
1154 1154
1155public class ArgumentDeclarationList_2 : ArgumentDeclarationList { 1155public class ArgumentDeclarationList_2 : ArgumentDeclarationList {
1156 public ArgumentDeclarationList_2(Parser yyq):base(yyq, 1156 public ArgumentDeclarationList_2(Parser yyq):base(yyq,
1157 ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) 1157 ((ArgumentDeclarationList)(yyq.StackAt(2).m_value))
1158 , 1158 ,
1159 ((Declaration)(yyq.StackAt(0).m_value)) 1159 ((Declaration)(yyq.StackAt(0).m_value))
1160 ){}} 1160 ){}}
1161 1161
1162public class KeyArgumentDeclarationList_1 : KeyArgumentDeclarationList { 1162public class KeyArgumentDeclarationList_1 : KeyArgumentDeclarationList {
1163 public KeyArgumentDeclarationList_1(Parser yyq):base(yyq, 1163 public KeyArgumentDeclarationList_1(Parser yyq):base(yyq,
1164 ((KeyDeclaration)(yyq.StackAt(0).m_value)) 1164 ((KeyDeclaration)(yyq.StackAt(0).m_value))
1165 ){}} 1165 ){}}
1166 1166
1167public class IntArgumentDeclarationList_1 : IntArgumentDeclarationList { 1167public class IntArgumentDeclarationList_1 : IntArgumentDeclarationList {
1168 public IntArgumentDeclarationList_1(Parser yyq):base(yyq, 1168 public IntArgumentDeclarationList_1(Parser yyq):base(yyq,
1169 ((IntDeclaration)(yyq.StackAt(0).m_value)) 1169 ((IntDeclaration)(yyq.StackAt(0).m_value))
1170 ){}} 1170 ){}}
1171 1171
1172public class VectorArgumentDeclarationList_1 : VectorArgumentDeclarationList { 1172public class VectorArgumentDeclarationList_1 : VectorArgumentDeclarationList {
1173 public VectorArgumentDeclarationList_1(Parser yyq):base(yyq, 1173 public VectorArgumentDeclarationList_1(Parser yyq):base(yyq,
1174 ((VecDeclaration)(yyq.StackAt(0).m_value)) 1174 ((VecDeclaration)(yyq.StackAt(0).m_value))
1175 ){}} 1175 ){}}
1176 1176
1177public class IntRotRotArgumentDeclarationList_1 : IntRotRotArgumentDeclarationList { 1177public class IntRotRotArgumentDeclarationList_1 : IntRotRotArgumentDeclarationList {
1178 public IntRotRotArgumentDeclarationList_1(Parser yyq):base(yyq, 1178 public IntRotRotArgumentDeclarationList_1(Parser yyq):base(yyq,
1179 ((IntDeclaration)(yyq.StackAt(4).m_value)) 1179 ((IntDeclaration)(yyq.StackAt(4).m_value))
1180 , 1180 ,
1181 ((RotDeclaration)(yyq.StackAt(2).m_value)) 1181 ((RotDeclaration)(yyq.StackAt(2).m_value))
1182 , 1182 ,
1183 ((RotDeclaration)(yyq.StackAt(0).m_value)) 1183 ((RotDeclaration)(yyq.StackAt(0).m_value))
1184 ){}} 1184 ){}}
1185 1185
1186public class IntVecVecArgumentDeclarationList_1 : IntVecVecArgumentDeclarationList { 1186public class IntVecVecArgumentDeclarationList_1 : IntVecVecArgumentDeclarationList {
1187 public IntVecVecArgumentDeclarationList_1(Parser yyq):base(yyq, 1187 public IntVecVecArgumentDeclarationList_1(Parser yyq):base(yyq,
1188 ((IntDeclaration)(yyq.StackAt(4).m_value)) 1188 ((IntDeclaration)(yyq.StackAt(4).m_value))
1189 , 1189 ,
1190 ((VecDeclaration)(yyq.StackAt(2).m_value)) 1190 ((VecDeclaration)(yyq.StackAt(2).m_value))
1191 , 1191 ,
1192 ((VecDeclaration)(yyq.StackAt(0).m_value)) 1192 ((VecDeclaration)(yyq.StackAt(0).m_value))
1193 ){}} 1193 ){}}
1194 1194
1195public class KeyIntIntArgumentDeclarationList_1 : KeyIntIntArgumentDeclarationList { 1195public class KeyIntIntArgumentDeclarationList_1 : KeyIntIntArgumentDeclarationList {
1196 public KeyIntIntArgumentDeclarationList_1(Parser yyq):base(yyq, 1196 public KeyIntIntArgumentDeclarationList_1(Parser yyq):base(yyq,
1197 ((KeyDeclaration)(yyq.StackAt(4).m_value)) 1197 ((KeyDeclaration)(yyq.StackAt(4).m_value))
1198 , 1198 ,
1199 ((IntDeclaration)(yyq.StackAt(2).m_value)) 1199 ((IntDeclaration)(yyq.StackAt(2).m_value))
1200 , 1200 ,
1201 ((IntDeclaration)(yyq.StackAt(0).m_value)) 1201 ((IntDeclaration)(yyq.StackAt(0).m_value))
1202 ){}} 1202 ){}}
1203 1203
1204public class Declaration_1 : Declaration { 1204public class Declaration_1 : Declaration {
1205 public Declaration_1(Parser yyq):base(yyq, 1205 public Declaration_1(Parser yyq):base(yyq,
1206 ((Typename)(yyq.StackAt(1).m_value)) 1206 ((Typename)(yyq.StackAt(1).m_value))
1207 .yytext, 1207 .yytext,
1208 ((IDENT)(yyq.StackAt(0).m_value)) 1208 ((IDENT)(yyq.StackAt(0).m_value))
1209 .yytext){}} 1209 .yytext){}}
1210 1210
1211public class KeyDeclaration_1 : KeyDeclaration { 1211public class KeyDeclaration_1 : KeyDeclaration {
1212 public KeyDeclaration_1(Parser yyq):base(yyq, 1212 public KeyDeclaration_1(Parser yyq):base(yyq,
1213 ((KEY_TYPE)(yyq.StackAt(1).m_value)) 1213 ((KEY_TYPE)(yyq.StackAt(1).m_value))
1214 .yytext, 1214 .yytext,
1215 ((IDENT)(yyq.StackAt(0).m_value)) 1215 ((IDENT)(yyq.StackAt(0).m_value))
1216 .yytext){}} 1216 .yytext){}}
1217 1217
1218public class IntDeclaration_1 : IntDeclaration { 1218public class IntDeclaration_1 : IntDeclaration {
1219 public IntDeclaration_1(Parser yyq):base(yyq, 1219 public IntDeclaration_1(Parser yyq):base(yyq,
1220 ((INTEGER_TYPE)(yyq.StackAt(1).m_value)) 1220 ((INTEGER_TYPE)(yyq.StackAt(1).m_value))
1221 .yytext, 1221 .yytext,
1222 ((IDENT)(yyq.StackAt(0).m_value)) 1222 ((IDENT)(yyq.StackAt(0).m_value))
1223 .yytext){}} 1223 .yytext){}}
1224 1224
1225public class VecDeclaration_1 : VecDeclaration { 1225public class VecDeclaration_1 : VecDeclaration {
1226 public VecDeclaration_1(Parser yyq):base(yyq, 1226 public VecDeclaration_1(Parser yyq):base(yyq,
1227 ((VECTOR_TYPE)(yyq.StackAt(1).m_value)) 1227 ((VECTOR_TYPE)(yyq.StackAt(1).m_value))
1228 .yytext, 1228 .yytext,
1229 ((IDENT)(yyq.StackAt(0).m_value)) 1229 ((IDENT)(yyq.StackAt(0).m_value))
1230 .yytext){}} 1230 .yytext){}}
1231 1231
1232public class RotDeclaration_1 : RotDeclaration { 1232public class RotDeclaration_1 : RotDeclaration {
1233 public RotDeclaration_1(Parser yyq):base(yyq, 1233 public RotDeclaration_1(Parser yyq):base(yyq,
1234 ((ROTATION_TYPE)(yyq.StackAt(1).m_value)) 1234 ((ROTATION_TYPE)(yyq.StackAt(1).m_value))
1235 .yytext, 1235 .yytext,
1236 ((IDENT)(yyq.StackAt(0).m_value)) 1236 ((IDENT)(yyq.StackAt(0).m_value))
1237 .yytext){}} 1237 .yytext){}}
1238 1238
1239public class CompoundStatement_1 : CompoundStatement { 1239public class CompoundStatement_1 : CompoundStatement {
1240 public CompoundStatement_1(Parser yyq):base(yyq){}} 1240 public CompoundStatement_1(Parser yyq):base(yyq){}}
1241 1241
1242public class CompoundStatement_2 : CompoundStatement { 1242public class CompoundStatement_2 : CompoundStatement {
1243 public CompoundStatement_2(Parser yyq):base(yyq, 1243 public CompoundStatement_2(Parser yyq):base(yyq,
1244 ((StatementList)(yyq.StackAt(1).m_value)) 1244 ((StatementList)(yyq.StackAt(1).m_value))
1245 ){}} 1245 ){}}
1246 1246
1247public class StatementList_1 : StatementList { 1247public class StatementList_1 : StatementList {
1248 public StatementList_1(Parser yyq):base(yyq, 1248 public StatementList_1(Parser yyq):base(yyq,
1249 ((Statement)(yyq.StackAt(0).m_value)) 1249 ((Statement)(yyq.StackAt(0).m_value))
1250 ){}} 1250 ){}}
1251 1251
1252public class StatementList_2 : StatementList { 1252public class StatementList_2 : StatementList {
1253 public StatementList_2(Parser yyq):base(yyq, 1253 public StatementList_2(Parser yyq):base(yyq,
1254 ((StatementList)(yyq.StackAt(1).m_value)) 1254 ((StatementList)(yyq.StackAt(1).m_value))
1255 , 1255 ,
1256 ((Statement)(yyq.StackAt(0).m_value)) 1256 ((Statement)(yyq.StackAt(0).m_value))
1257 ){}} 1257 ){}}
1258 1258
1259public class EmptyStatement_1 : EmptyStatement { 1259public class EmptyStatement_1 : EmptyStatement {
1260 public EmptyStatement_1(Parser yyq):base(yyq){}} 1260 public EmptyStatement_1(Parser yyq):base(yyq){}}
1261 1261
1262public class Statement_1 : Statement { 1262public class Statement_1 : Statement {
1263 public Statement_1(Parser yyq):base(yyq, 1263 public Statement_1(Parser yyq):base(yyq,
1264 ((EmptyStatement)(yyq.StackAt(1).m_value)) 1264 ((EmptyStatement)(yyq.StackAt(1).m_value))
1265 ){}} 1265 ){}}
1266 1266
1267public class Statement_2 : Statement { 1267public class Statement_2 : Statement {
1268 public Statement_2(Parser yyq):base(yyq, 1268 public Statement_2(Parser yyq):base(yyq,
1269 ((Declaration)(yyq.StackAt(1).m_value)) 1269 ((Declaration)(yyq.StackAt(1).m_value))
1270 ){}} 1270 ){}}
1271 1271
1272public class Statement_3 : Statement { 1272public class Statement_3 : Statement {
1273 public Statement_3(Parser yyq):base(yyq, 1273 public Statement_3(Parser yyq):base(yyq,
1274 ((Assignment)(yyq.StackAt(1).m_value)) 1274 ((Assignment)(yyq.StackAt(1).m_value))
1275 ){}} 1275 ){}}
1276 1276
1277public class Statement_4 : Statement { 1277public class Statement_4 : Statement {
1278 public Statement_4(Parser yyq):base(yyq, 1278 public Statement_4(Parser yyq):base(yyq,
1279 ((Expression)(yyq.StackAt(1).m_value)) 1279 ((Expression)(yyq.StackAt(1).m_value))
1280 ){}} 1280 ){}}
1281 1281
1282public class Statement_5 : Statement { 1282public class Statement_5 : Statement {
1283 public Statement_5(Parser yyq):base(yyq, 1283 public Statement_5(Parser yyq):base(yyq,
1284 ((ReturnStatement)(yyq.StackAt(1).m_value)) 1284 ((ReturnStatement)(yyq.StackAt(1).m_value))
1285 ){}} 1285 ){}}
1286 1286
1287public class Statement_6 : Statement { 1287public class Statement_6 : Statement {
1288 public Statement_6(Parser yyq):base(yyq, 1288 public Statement_6(Parser yyq):base(yyq,
1289 ((JumpLabel)(yyq.StackAt(1).m_value)) 1289 ((JumpLabel)(yyq.StackAt(1).m_value))
1290 ){}} 1290 ){}}
1291 1291
1292public class Statement_7 : Statement { 1292public class Statement_7 : Statement {
1293 public Statement_7(Parser yyq):base(yyq, 1293 public Statement_7(Parser yyq):base(yyq,
1294 ((JumpStatement)(yyq.StackAt(1).m_value)) 1294 ((JumpStatement)(yyq.StackAt(1).m_value))
1295 ){}} 1295 ){}}
1296 1296
1297public class Statement_8 : Statement { 1297public class Statement_8 : Statement {
1298 public Statement_8(Parser yyq):base(yyq, 1298 public Statement_8(Parser yyq):base(yyq,
1299 ((StateChange)(yyq.StackAt(1).m_value)) 1299 ((StateChange)(yyq.StackAt(1).m_value))
1300 ){}} 1300 ){}}
1301 1301
1302public class Statement_9 : Statement { 1302public class Statement_9 : Statement {
1303 public Statement_9(Parser yyq):base(yyq, 1303 public Statement_9(Parser yyq):base(yyq,
1304 ((IfStatement)(yyq.StackAt(0).m_value)) 1304 ((IfStatement)(yyq.StackAt(0).m_value))
1305 ){}} 1305 ){}}
1306 1306
1307public class Statement_10 : Statement { 1307public class Statement_10 : Statement {
1308 public Statement_10(Parser yyq):base(yyq, 1308 public Statement_10(Parser yyq):base(yyq,
1309 ((WhileStatement)(yyq.StackAt(0).m_value)) 1309 ((WhileStatement)(yyq.StackAt(0).m_value))
1310 ){}} 1310 ){}}
1311 1311
1312public class Statement_11 : Statement { 1312public class Statement_11 : Statement {
1313 public Statement_11(Parser yyq):base(yyq, 1313 public Statement_11(Parser yyq):base(yyq,
1314 ((DoWhileStatement)(yyq.StackAt(0).m_value)) 1314 ((DoWhileStatement)(yyq.StackAt(0).m_value))
1315 ){}} 1315 ){}}
1316 1316
1317public class Statement_12 : Statement { 1317public class Statement_12 : Statement {
1318 public Statement_12(Parser yyq):base(yyq, 1318 public Statement_12(Parser yyq):base(yyq,
1319 ((ForLoop)(yyq.StackAt(0).m_value)) 1319 ((ForLoop)(yyq.StackAt(0).m_value))
1320 ){}} 1320 ){}}
1321 1321
1322public class Statement_13 : Statement { 1322public class Statement_13 : Statement {
1323 public Statement_13(Parser yyq):base(yyq, 1323 public Statement_13(Parser yyq):base(yyq,
1324 ((CompoundStatement)(yyq.StackAt(0).m_value)) 1324 ((CompoundStatement)(yyq.StackAt(0).m_value))
1325 ){}} 1325 ){}}
1326 1326
1327public class JumpLabel_1 : JumpLabel { 1327public class JumpLabel_1 : JumpLabel {
1328 public JumpLabel_1(Parser yyq):base(yyq, 1328 public JumpLabel_1(Parser yyq):base(yyq,
1329 ((IDENT)(yyq.StackAt(0).m_value)) 1329 ((IDENT)(yyq.StackAt(0).m_value))
1330 .yytext){}} 1330 .yytext){}}
1331 1331
1332public class JumpStatement_1 : JumpStatement { 1332public class JumpStatement_1 : JumpStatement {
1333 public JumpStatement_1(Parser yyq):base(yyq, 1333 public JumpStatement_1(Parser yyq):base(yyq,
1334 ((IDENT)(yyq.StackAt(0).m_value)) 1334 ((IDENT)(yyq.StackAt(0).m_value))
1335 .yytext){}} 1335 .yytext){}}
1336 1336
1337public class StateChange_1 : StateChange { 1337public class StateChange_1 : StateChange {
1338 public StateChange_1(Parser yyq):base(yyq, 1338 public StateChange_1(Parser yyq):base(yyq,
1339 ((IDENT)(yyq.StackAt(0).m_value)) 1339 ((IDENT)(yyq.StackAt(0).m_value))
1340 .yytext){}} 1340 .yytext){}}
1341 1341
1342public class StateChange_2 : StateChange { 1342public class StateChange_2 : StateChange {
1343 public StateChange_2(Parser yyq):base(yyq, 1343 public StateChange_2(Parser yyq):base(yyq,
1344 ((DEFAULT_STATE)(yyq.StackAt(0).m_value)) 1344 ((DEFAULT_STATE)(yyq.StackAt(0).m_value))
1345 .yytext){}} 1345 .yytext){}}
1346 1346
1347public class IfStatement_1 : IfStatement { 1347public class IfStatement_1 : IfStatement {
1348 public IfStatement_1(Parser yyq):base(yyq, 1348 public IfStatement_1(Parser yyq):base(yyq,
1349 ((Expression)(yyq.StackAt(2).m_value)) 1349 ((Expression)(yyq.StackAt(2).m_value))
1350 , 1350 ,
1351 ((Statement)(yyq.StackAt(0).m_value)) 1351 ((Statement)(yyq.StackAt(0).m_value))
1352 ){}} 1352 ){}}
1353 1353
1354public class IfStatement_2 : IfStatement { 1354public class IfStatement_2 : IfStatement {
1355 public IfStatement_2(Parser yyq):base(yyq, 1355 public IfStatement_2(Parser yyq):base(yyq,
1356 ((Expression)(yyq.StackAt(4).m_value)) 1356 ((Expression)(yyq.StackAt(4).m_value))
1357 , 1357 ,
1358 ((Statement)(yyq.StackAt(2).m_value)) 1358 ((Statement)(yyq.StackAt(2).m_value))
1359 , 1359 ,
1360 ((Statement)(yyq.StackAt(0).m_value)) 1360 ((Statement)(yyq.StackAt(0).m_value))
1361 ){}} 1361 ){}}
1362 1362
1363public class IfStatement_3 : IfStatement { 1363public class IfStatement_3 : IfStatement {
1364 public IfStatement_3(Parser yyq):base(yyq, 1364 public IfStatement_3(Parser yyq):base(yyq,
1365 ((SimpleAssignment)(yyq.StackAt(2).m_value)) 1365 ((SimpleAssignment)(yyq.StackAt(2).m_value))
1366 , 1366 ,
1367 ((Statement)(yyq.StackAt(0).m_value)) 1367 ((Statement)(yyq.StackAt(0).m_value))
1368 ){}} 1368 ){}}
1369 1369
1370public class IfStatement_4 : IfStatement { 1370public class IfStatement_4 : IfStatement {
1371 public IfStatement_4(Parser yyq):base(yyq, 1371 public IfStatement_4(Parser yyq):base(yyq,
1372 ((SimpleAssignment)(yyq.StackAt(4).m_value)) 1372 ((SimpleAssignment)(yyq.StackAt(4).m_value))
1373 , 1373 ,
1374 ((Statement)(yyq.StackAt(2).m_value)) 1374 ((Statement)(yyq.StackAt(2).m_value))
1375 , 1375 ,
1376 ((Statement)(yyq.StackAt(0).m_value)) 1376 ((Statement)(yyq.StackAt(0).m_value))
1377 ){}} 1377 ){}}
1378 1378
1379public class WhileStatement_1 : WhileStatement { 1379public class WhileStatement_1 : WhileStatement {
1380 public WhileStatement_1(Parser yyq):base(yyq, 1380 public WhileStatement_1(Parser yyq):base(yyq,
1381 ((Expression)(yyq.StackAt(2).m_value)) 1381 ((Expression)(yyq.StackAt(2).m_value))
1382 , 1382 ,
1383 ((Statement)(yyq.StackAt(0).m_value)) 1383 ((Statement)(yyq.StackAt(0).m_value))
1384 ){}} 1384 ){}}
1385 1385
1386public class WhileStatement_2 : WhileStatement { 1386public class WhileStatement_2 : WhileStatement {
1387 public WhileStatement_2(Parser yyq):base(yyq, 1387 public WhileStatement_2(Parser yyq):base(yyq,
1388 ((SimpleAssignment)(yyq.StackAt(2).m_value)) 1388 ((SimpleAssignment)(yyq.StackAt(2).m_value))
1389 , 1389 ,
1390 ((Statement)(yyq.StackAt(0).m_value)) 1390 ((Statement)(yyq.StackAt(0).m_value))
1391 ){}} 1391 ){}}
1392 1392
1393public class DoWhileStatement_1 : DoWhileStatement { 1393public class DoWhileStatement_1 : DoWhileStatement {
1394 public DoWhileStatement_1(Parser yyq):base(yyq, 1394 public DoWhileStatement_1(Parser yyq):base(yyq,
1395 ((Expression)(yyq.StackAt(2).m_value)) 1395 ((Expression)(yyq.StackAt(2).m_value))
1396 , 1396 ,
1397 ((Statement)(yyq.StackAt(5).m_value)) 1397 ((Statement)(yyq.StackAt(5).m_value))
1398 ){}} 1398 ){}}
1399 1399
1400public class DoWhileStatement_2 : DoWhileStatement { 1400public class DoWhileStatement_2 : DoWhileStatement {
1401 public DoWhileStatement_2(Parser yyq):base(yyq, 1401 public DoWhileStatement_2(Parser yyq):base(yyq,
1402 ((SimpleAssignment)(yyq.StackAt(2).m_value)) 1402 ((SimpleAssignment)(yyq.StackAt(2).m_value))
1403 , 1403 ,
1404 ((Statement)(yyq.StackAt(5).m_value)) 1404 ((Statement)(yyq.StackAt(5).m_value))
1405 ){}} 1405 ){}}
1406 1406
1407public class ForLoop_1 : ForLoop { 1407public class ForLoop_1 : ForLoop {
1408 public ForLoop_1(Parser yyq):base(yyq, 1408 public ForLoop_1(Parser yyq):base(yyq,
1409 ((ForLoopStatement)(yyq.StackAt(6).m_value)) 1409 ((ForLoopStatement)(yyq.StackAt(6).m_value))
1410 , 1410 ,
1411 ((Expression)(yyq.StackAt(4).m_value)) 1411 ((Expression)(yyq.StackAt(4).m_value))
1412 , 1412 ,
1413 ((ForLoopStatement)(yyq.StackAt(2).m_value)) 1413 ((ForLoopStatement)(yyq.StackAt(2).m_value))
1414 , 1414 ,
1415 ((Statement)(yyq.StackAt(0).m_value)) 1415 ((Statement)(yyq.StackAt(0).m_value))
1416 ){}} 1416 ){}}
1417 1417
1418public class ForLoop_2 : ForLoop { 1418public class ForLoop_2 : ForLoop {
1419 public ForLoop_2(Parser yyq):base(yyq,null, 1419 public ForLoop_2(Parser yyq):base(yyq,null,
1420 ((Expression)(yyq.StackAt(4).m_value)) 1420 ((Expression)(yyq.StackAt(4).m_value))
1421 , 1421 ,
1422 ((ForLoopStatement)(yyq.StackAt(2).m_value)) 1422 ((ForLoopStatement)(yyq.StackAt(2).m_value))
1423 , 1423 ,
1424 ((Statement)(yyq.StackAt(0).m_value)) 1424 ((Statement)(yyq.StackAt(0).m_value))
1425 ){}} 1425 ){}}
1426 1426
1427public class ForLoopStatement_1 : ForLoopStatement { 1427public class ForLoopStatement_1 : ForLoopStatement {
1428 public ForLoopStatement_1(Parser yyq):base(yyq, 1428 public ForLoopStatement_1(Parser yyq):base(yyq,
1429 ((Expression)(yyq.StackAt(0).m_value)) 1429 ((Expression)(yyq.StackAt(0).m_value))
1430 ){}} 1430 ){}}
1431 1431
1432public class ForLoopStatement_2 : ForLoopStatement { 1432public class ForLoopStatement_2 : ForLoopStatement {
1433 public ForLoopStatement_2(Parser yyq):base(yyq, 1433 public ForLoopStatement_2(Parser yyq):base(yyq,
1434 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1434 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1435 ){}} 1435 ){}}
1436 1436
1437public class ForLoopStatement_3 : ForLoopStatement { 1437public class ForLoopStatement_3 : ForLoopStatement {
1438 public ForLoopStatement_3(Parser yyq):base(yyq, 1438 public ForLoopStatement_3(Parser yyq):base(yyq,
1439 ((ForLoopStatement)(yyq.StackAt(2).m_value)) 1439 ((ForLoopStatement)(yyq.StackAt(2).m_value))
1440 , 1440 ,
1441 ((Expression)(yyq.StackAt(0).m_value)) 1441 ((Expression)(yyq.StackAt(0).m_value))
1442 ){}} 1442 ){}}
1443 1443
1444public class ForLoopStatement_4 : ForLoopStatement { 1444public class ForLoopStatement_4 : ForLoopStatement {
1445 public ForLoopStatement_4(Parser yyq):base(yyq, 1445 public ForLoopStatement_4(Parser yyq):base(yyq,
1446 ((ForLoopStatement)(yyq.StackAt(2).m_value)) 1446 ((ForLoopStatement)(yyq.StackAt(2).m_value))
1447 , 1447 ,
1448 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1448 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1449 ){}} 1449 ){}}
1450 1450
1451public class Assignment_1 : Assignment { 1451public class Assignment_1 : Assignment {
1452 public Assignment_1(Parser yyq):base(yyq, 1452 public Assignment_1(Parser yyq):base(yyq,
1453 ((Declaration)(yyq.StackAt(2).m_value)) 1453 ((Declaration)(yyq.StackAt(2).m_value))
1454 , 1454 ,
1455 ((Expression)(yyq.StackAt(0).m_value)) 1455 ((Expression)(yyq.StackAt(0).m_value))
1456 , 1456 ,
1457 ((EQUALS)(yyq.StackAt(1).m_value)) 1457 ((EQUALS)(yyq.StackAt(1).m_value))
1458 .yytext){}} 1458 .yytext){}}
1459 1459
1460public class Assignment_2 : Assignment { 1460public class Assignment_2 : Assignment {
1461 public Assignment_2(Parser yyq):base(yyq, 1461 public Assignment_2(Parser yyq):base(yyq,
1462 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1462 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1463 ){}} 1463 ){}}
1464 1464
1465public class SimpleAssignment_1 : SimpleAssignment { 1465public class SimpleAssignment_1 : SimpleAssignment {
1466 public SimpleAssignment_1(Parser yyq):base(yyq, 1466 public SimpleAssignment_1(Parser yyq):base(yyq,
1467 ((IDENT)(yyq.StackAt(2).m_value)) 1467 ((IDENT)(yyq.StackAt(2).m_value))
1468 , 1468 ,
1469 ((Expression)(yyq.StackAt(0).m_value)) 1469 ((Expression)(yyq.StackAt(0).m_value))
1470 , 1470 ,
1471 ((EQUALS)(yyq.StackAt(1).m_value)) 1471 ((EQUALS)(yyq.StackAt(1).m_value))
1472 .yytext){}} 1472 .yytext){}}
1473 1473
1474public class SimpleAssignment_2 : SimpleAssignment { 1474public class SimpleAssignment_2 : SimpleAssignment {
1475 public SimpleAssignment_2(Parser yyq):base(yyq, 1475 public SimpleAssignment_2(Parser yyq):base(yyq,
1476 ((IDENT)(yyq.StackAt(2).m_value)) 1476 ((IDENT)(yyq.StackAt(2).m_value))
1477 , 1477 ,
1478 ((Expression)(yyq.StackAt(0).m_value)) 1478 ((Expression)(yyq.StackAt(0).m_value))
1479 , 1479 ,
1480 ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) 1480 ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
1481 .yytext){}} 1481 .yytext){}}
1482 1482
1483public class SimpleAssignment_3 : SimpleAssignment { 1483public class SimpleAssignment_3 : SimpleAssignment {
1484 public SimpleAssignment_3(Parser yyq):base(yyq, 1484 public SimpleAssignment_3(Parser yyq):base(yyq,
1485 ((IDENT)(yyq.StackAt(2).m_value)) 1485 ((IDENT)(yyq.StackAt(2).m_value))
1486 , 1486 ,
1487 ((Expression)(yyq.StackAt(0).m_value)) 1487 ((Expression)(yyq.StackAt(0).m_value))
1488 , 1488 ,
1489 ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) 1489 ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
1490 .yytext){}} 1490 .yytext){}}
1491 1491
1492public class SimpleAssignment_4 : SimpleAssignment { 1492public class SimpleAssignment_4 : SimpleAssignment {
1493 public SimpleAssignment_4(Parser yyq):base(yyq, 1493 public SimpleAssignment_4(Parser yyq):base(yyq,
1494 ((IDENT)(yyq.StackAt(2).m_value)) 1494 ((IDENT)(yyq.StackAt(2).m_value))
1495 , 1495 ,
1496 ((Expression)(yyq.StackAt(0).m_value)) 1496 ((Expression)(yyq.StackAt(0).m_value))
1497 , 1497 ,
1498 ((STAR_EQUALS)(yyq.StackAt(1).m_value)) 1498 ((STAR_EQUALS)(yyq.StackAt(1).m_value))
1499 .yytext){}} 1499 .yytext){}}
1500 1500
1501public class SimpleAssignment_5 : SimpleAssignment { 1501public class SimpleAssignment_5 : SimpleAssignment {
1502 public SimpleAssignment_5(Parser yyq):base(yyq, 1502 public SimpleAssignment_5(Parser yyq):base(yyq,
1503 ((IDENT)(yyq.StackAt(2).m_value)) 1503 ((IDENT)(yyq.StackAt(2).m_value))
1504 , 1504 ,
1505 ((Expression)(yyq.StackAt(0).m_value)) 1505 ((Expression)(yyq.StackAt(0).m_value))
1506 , 1506 ,
1507 ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) 1507 ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
1508 .yytext){}} 1508 .yytext){}}
1509 1509
1510public class SimpleAssignment_6 : SimpleAssignment { 1510public class SimpleAssignment_6 : SimpleAssignment {
1511 public SimpleAssignment_6(Parser yyq):base(yyq, 1511 public SimpleAssignment_6(Parser yyq):base(yyq,
1512 ((IDENT)(yyq.StackAt(2).m_value)) 1512 ((IDENT)(yyq.StackAt(2).m_value))
1513 , 1513 ,
1514 ((Expression)(yyq.StackAt(0).m_value)) 1514 ((Expression)(yyq.StackAt(0).m_value))
1515 , 1515 ,
1516 ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) 1516 ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
1517 .yytext){}} 1517 .yytext){}}
1518 1518
1519public class SimpleAssignment_7 : SimpleAssignment { 1519public class SimpleAssignment_7 : SimpleAssignment {
1520 public SimpleAssignment_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1520 public SimpleAssignment_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1521)yyq), 1521)yyq),
1522 ((IDENT)(yyq.StackAt(4).m_value)) 1522 ((IDENT)(yyq.StackAt(4).m_value))
1523 .yytext, 1523 .yytext,
1524 ((IDENT)(yyq.StackAt(2).m_value)) 1524 ((IDENT)(yyq.StackAt(2).m_value))
1525 .yytext), 1525 .yytext),
1526 ((Expression)(yyq.StackAt(0).m_value)) 1526 ((Expression)(yyq.StackAt(0).m_value))
1527 , 1527 ,
1528 ((EQUALS)(yyq.StackAt(1).m_value)) 1528 ((EQUALS)(yyq.StackAt(1).m_value))
1529 .yytext){}} 1529 .yytext){}}
1530 1530
1531public class SimpleAssignment_8 : SimpleAssignment { 1531public class SimpleAssignment_8 : SimpleAssignment {
1532 public SimpleAssignment_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1532 public SimpleAssignment_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1533)yyq), 1533)yyq),
1534 ((IDENT)(yyq.StackAt(4).m_value)) 1534 ((IDENT)(yyq.StackAt(4).m_value))
1535 .yytext, 1535 .yytext,
1536 ((IDENT)(yyq.StackAt(2).m_value)) 1536 ((IDENT)(yyq.StackAt(2).m_value))
1537 .yytext), 1537 .yytext),
1538 ((Expression)(yyq.StackAt(0).m_value)) 1538 ((Expression)(yyq.StackAt(0).m_value))
1539 , 1539 ,
1540 ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) 1540 ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
1541 .yytext){}} 1541 .yytext){}}
1542 1542
1543public class SimpleAssignment_9 : SimpleAssignment { 1543public class SimpleAssignment_9 : SimpleAssignment {
1544 public SimpleAssignment_9(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1544 public SimpleAssignment_9(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1545)yyq), 1545)yyq),
1546 ((IDENT)(yyq.StackAt(4).m_value)) 1546 ((IDENT)(yyq.StackAt(4).m_value))
1547 .yytext, 1547 .yytext,
1548 ((IDENT)(yyq.StackAt(2).m_value)) 1548 ((IDENT)(yyq.StackAt(2).m_value))
1549 .yytext), 1549 .yytext),
1550 ((Expression)(yyq.StackAt(0).m_value)) 1550 ((Expression)(yyq.StackAt(0).m_value))
1551 , 1551 ,
1552 ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) 1552 ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
1553 .yytext){}} 1553 .yytext){}}
1554 1554
1555public class SimpleAssignment_10 : SimpleAssignment { 1555public class SimpleAssignment_10 : SimpleAssignment {
1556 public SimpleAssignment_10(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1556 public SimpleAssignment_10(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1557)yyq), 1557)yyq),
1558 ((IDENT)(yyq.StackAt(4).m_value)) 1558 ((IDENT)(yyq.StackAt(4).m_value))
1559 .yytext, 1559 .yytext,
1560 ((IDENT)(yyq.StackAt(2).m_value)) 1560 ((IDENT)(yyq.StackAt(2).m_value))
1561 .yytext), 1561 .yytext),
1562 ((Expression)(yyq.StackAt(0).m_value)) 1562 ((Expression)(yyq.StackAt(0).m_value))
1563 , 1563 ,
1564 ((STAR_EQUALS)(yyq.StackAt(1).m_value)) 1564 ((STAR_EQUALS)(yyq.StackAt(1).m_value))
1565 .yytext){}} 1565 .yytext){}}
1566 1566
1567public class SimpleAssignment_11 : SimpleAssignment { 1567public class SimpleAssignment_11 : SimpleAssignment {
1568 public SimpleAssignment_11(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1568 public SimpleAssignment_11(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1569)yyq), 1569)yyq),
1570 ((IDENT)(yyq.StackAt(4).m_value)) 1570 ((IDENT)(yyq.StackAt(4).m_value))
1571 .yytext, 1571 .yytext,
1572 ((IDENT)(yyq.StackAt(2).m_value)) 1572 ((IDENT)(yyq.StackAt(2).m_value))
1573 .yytext), 1573 .yytext),
1574 ((Expression)(yyq.StackAt(0).m_value)) 1574 ((Expression)(yyq.StackAt(0).m_value))
1575 , 1575 ,
1576 ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) 1576 ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
1577 .yytext){}} 1577 .yytext){}}
1578 1578
1579public class SimpleAssignment_12 : SimpleAssignment { 1579public class SimpleAssignment_12 : SimpleAssignment {
1580 public SimpleAssignment_12(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1580 public SimpleAssignment_12(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1581)yyq), 1581)yyq),
1582 ((IDENT)(yyq.StackAt(4).m_value)) 1582 ((IDENT)(yyq.StackAt(4).m_value))
1583 .yytext, 1583 .yytext,
1584 ((IDENT)(yyq.StackAt(2).m_value)) 1584 ((IDENT)(yyq.StackAt(2).m_value))
1585 .yytext), 1585 .yytext),
1586 ((Expression)(yyq.StackAt(0).m_value)) 1586 ((Expression)(yyq.StackAt(0).m_value))
1587 , 1587 ,
1588 ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) 1588 ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
1589 .yytext){}} 1589 .yytext){}}
1590 1590
1591public class SimpleAssignment_13 : SimpleAssignment { 1591public class SimpleAssignment_13 : SimpleAssignment {
1592 public SimpleAssignment_13(Parser yyq):base(yyq, 1592 public SimpleAssignment_13(Parser yyq):base(yyq,
1593 ((IDENT)(yyq.StackAt(2).m_value)) 1593 ((IDENT)(yyq.StackAt(2).m_value))
1594 , 1594 ,
1595 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1595 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1596 , 1596 ,
1597 ((EQUALS)(yyq.StackAt(1).m_value)) 1597 ((EQUALS)(yyq.StackAt(1).m_value))
1598 .yytext){}} 1598 .yytext){}}
1599 1599
1600public class SimpleAssignment_14 : SimpleAssignment { 1600public class SimpleAssignment_14 : SimpleAssignment {
1601 public SimpleAssignment_14(Parser yyq):base(yyq, 1601 public SimpleAssignment_14(Parser yyq):base(yyq,
1602 ((IDENT)(yyq.StackAt(2).m_value)) 1602 ((IDENT)(yyq.StackAt(2).m_value))
1603 , 1603 ,
1604 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1604 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1605 , 1605 ,
1606 ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) 1606 ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
1607 .yytext){}} 1607 .yytext){}}
1608 1608
1609public class SimpleAssignment_15 : SimpleAssignment { 1609public class SimpleAssignment_15 : SimpleAssignment {
1610 public SimpleAssignment_15(Parser yyq):base(yyq, 1610 public SimpleAssignment_15(Parser yyq):base(yyq,
1611 ((IDENT)(yyq.StackAt(2).m_value)) 1611 ((IDENT)(yyq.StackAt(2).m_value))
1612 , 1612 ,
1613 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1613 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1614 , 1614 ,
1615 ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) 1615 ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
1616 .yytext){}} 1616 .yytext){}}
1617 1617
1618public class SimpleAssignment_16 : SimpleAssignment { 1618public class SimpleAssignment_16 : SimpleAssignment {
1619 public SimpleAssignment_16(Parser yyq):base(yyq, 1619 public SimpleAssignment_16(Parser yyq):base(yyq,
1620 ((IDENT)(yyq.StackAt(2).m_value)) 1620 ((IDENT)(yyq.StackAt(2).m_value))
1621 , 1621 ,
1622 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1622 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1623 , 1623 ,
1624 ((STAR_EQUALS)(yyq.StackAt(1).m_value)) 1624 ((STAR_EQUALS)(yyq.StackAt(1).m_value))
1625 .yytext){}} 1625 .yytext){}}
1626 1626
1627public class SimpleAssignment_17 : SimpleAssignment { 1627public class SimpleAssignment_17 : SimpleAssignment {
1628 public SimpleAssignment_17(Parser yyq):base(yyq, 1628 public SimpleAssignment_17(Parser yyq):base(yyq,
1629 ((IDENT)(yyq.StackAt(2).m_value)) 1629 ((IDENT)(yyq.StackAt(2).m_value))
1630 , 1630 ,
1631 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1631 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1632 , 1632 ,
1633 ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) 1633 ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
1634 .yytext){}} 1634 .yytext){}}
1635 1635
1636public class SimpleAssignment_18 : SimpleAssignment { 1636public class SimpleAssignment_18 : SimpleAssignment {
1637 public SimpleAssignment_18(Parser yyq):base(yyq, 1637 public SimpleAssignment_18(Parser yyq):base(yyq,
1638 ((IDENT)(yyq.StackAt(2).m_value)) 1638 ((IDENT)(yyq.StackAt(2).m_value))
1639 , 1639 ,
1640 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1640 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1641 , 1641 ,
1642 ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) 1642 ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
1643 .yytext){}} 1643 .yytext){}}
1644 1644
1645public class SimpleAssignment_19 : SimpleAssignment { 1645public class SimpleAssignment_19 : SimpleAssignment {
1646 public SimpleAssignment_19(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1646 public SimpleAssignment_19(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1647)yyq), 1647)yyq),
1648 ((IDENT)(yyq.StackAt(4).m_value)) 1648 ((IDENT)(yyq.StackAt(4).m_value))
1649 .yytext, 1649 .yytext,
1650 ((IDENT)(yyq.StackAt(2).m_value)) 1650 ((IDENT)(yyq.StackAt(2).m_value))
1651 .yytext), 1651 .yytext),
1652 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1652 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1653 , 1653 ,
1654 ((EQUALS)(yyq.StackAt(1).m_value)) 1654 ((EQUALS)(yyq.StackAt(1).m_value))
1655 .yytext){}} 1655 .yytext){}}
1656 1656
1657public class SimpleAssignment_20 : SimpleAssignment { 1657public class SimpleAssignment_20 : SimpleAssignment {
1658 public SimpleAssignment_20(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1658 public SimpleAssignment_20(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1659)yyq), 1659)yyq),
1660 ((IDENT)(yyq.StackAt(4).m_value)) 1660 ((IDENT)(yyq.StackAt(4).m_value))
1661 .yytext, 1661 .yytext,
1662 ((IDENT)(yyq.StackAt(2).m_value)) 1662 ((IDENT)(yyq.StackAt(2).m_value))
1663 .yytext), 1663 .yytext),
1664 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1664 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1665 , 1665 ,
1666 ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) 1666 ((PLUS_EQUALS)(yyq.StackAt(1).m_value))
1667 .yytext){}} 1667 .yytext){}}
1668 1668
1669public class SimpleAssignment_21 : SimpleAssignment { 1669public class SimpleAssignment_21 : SimpleAssignment {
1670 public SimpleAssignment_21(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1670 public SimpleAssignment_21(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1671)yyq), 1671)yyq),
1672 ((IDENT)(yyq.StackAt(4).m_value)) 1672 ((IDENT)(yyq.StackAt(4).m_value))
1673 .yytext, 1673 .yytext,
1674 ((IDENT)(yyq.StackAt(2).m_value)) 1674 ((IDENT)(yyq.StackAt(2).m_value))
1675 .yytext), 1675 .yytext),
1676 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1676 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1677 , 1677 ,
1678 ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) 1678 ((MINUS_EQUALS)(yyq.StackAt(1).m_value))
1679 .yytext){}} 1679 .yytext){}}
1680 1680
1681public class SimpleAssignment_22 : SimpleAssignment { 1681public class SimpleAssignment_22 : SimpleAssignment {
1682 public SimpleAssignment_22(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1682 public SimpleAssignment_22(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1683)yyq), 1683)yyq),
1684 ((IDENT)(yyq.StackAt(4).m_value)) 1684 ((IDENT)(yyq.StackAt(4).m_value))
1685 .yytext, 1685 .yytext,
1686 ((IDENT)(yyq.StackAt(2).m_value)) 1686 ((IDENT)(yyq.StackAt(2).m_value))
1687 .yytext), 1687 .yytext),
1688 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1688 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1689 , 1689 ,
1690 ((STAR_EQUALS)(yyq.StackAt(1).m_value)) 1690 ((STAR_EQUALS)(yyq.StackAt(1).m_value))
1691 .yytext){}} 1691 .yytext){}}
1692 1692
1693public class SimpleAssignment_23 : SimpleAssignment { 1693public class SimpleAssignment_23 : SimpleAssignment {
1694 public SimpleAssignment_23(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1694 public SimpleAssignment_23(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1695)yyq), 1695)yyq),
1696 ((IDENT)(yyq.StackAt(4).m_value)) 1696 ((IDENT)(yyq.StackAt(4).m_value))
1697 .yytext, 1697 .yytext,
1698 ((IDENT)(yyq.StackAt(2).m_value)) 1698 ((IDENT)(yyq.StackAt(2).m_value))
1699 .yytext), 1699 .yytext),
1700 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1700 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1701 , 1701 ,
1702 ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) 1702 ((SLASH_EQUALS)(yyq.StackAt(1).m_value))
1703 .yytext){}} 1703 .yytext){}}
1704 1704
1705public class SimpleAssignment_24 : SimpleAssignment { 1705public class SimpleAssignment_24 : SimpleAssignment {
1706 public SimpleAssignment_24(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1706 public SimpleAssignment_24(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1707)yyq), 1707)yyq),
1708 ((IDENT)(yyq.StackAt(4).m_value)) 1708 ((IDENT)(yyq.StackAt(4).m_value))
1709 .yytext, 1709 .yytext,
1710 ((IDENT)(yyq.StackAt(2).m_value)) 1710 ((IDENT)(yyq.StackAt(2).m_value))
1711 .yytext), 1711 .yytext),
1712 ((SimpleAssignment)(yyq.StackAt(0).m_value)) 1712 ((SimpleAssignment)(yyq.StackAt(0).m_value))
1713 , 1713 ,
1714 ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) 1714 ((PERCENT_EQUALS)(yyq.StackAt(1).m_value))
1715 .yytext){}} 1715 .yytext){}}
1716 1716
1717public class ReturnStatement_1 : ReturnStatement { 1717public class ReturnStatement_1 : ReturnStatement {
1718 public ReturnStatement_1(Parser yyq):base(yyq, 1718 public ReturnStatement_1(Parser yyq):base(yyq,
1719 ((Expression)(yyq.StackAt(0).m_value)) 1719 ((Expression)(yyq.StackAt(0).m_value))
1720 ){}} 1720 ){}}
1721 1721
1722public class ReturnStatement_2 : ReturnStatement { 1722public class ReturnStatement_2 : ReturnStatement {
1723 public ReturnStatement_2(Parser yyq):base(yyq){}} 1723 public ReturnStatement_2(Parser yyq):base(yyq){}}
1724 1724
1725public class Constant_1 : Constant { 1725public class Constant_1 : Constant {
1726 public Constant_1(Parser yyq):base(yyq,"integer", 1726 public Constant_1(Parser yyq):base(yyq,"integer",
1727 ((INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) 1727 ((INTEGER_CONSTANT)(yyq.StackAt(0).m_value))
1728 .yytext){}} 1728 .yytext){}}
1729 1729
1730public class Constant_2 : Constant { 1730public class Constant_2 : Constant {
1731 public Constant_2(Parser yyq):base(yyq,"integer", 1731 public Constant_2(Parser yyq):base(yyq,"integer",
1732 ((HEX_INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) 1732 ((HEX_INTEGER_CONSTANT)(yyq.StackAt(0).m_value))
1733 .yytext){}} 1733 .yytext){}}
1734 1734
1735public class Constant_3 : Constant { 1735public class Constant_3 : Constant {
1736 public Constant_3(Parser yyq):base(yyq,"float", 1736 public Constant_3(Parser yyq):base(yyq,"float",
1737 ((FLOAT_CONSTANT)(yyq.StackAt(0).m_value)) 1737 ((FLOAT_CONSTANT)(yyq.StackAt(0).m_value))
1738 .yytext){}} 1738 .yytext){}}
1739 1739
1740public class Constant_4 : Constant { 1740public class Constant_4 : Constant {
1741 public Constant_4(Parser yyq):base(yyq,"string", 1741 public Constant_4(Parser yyq):base(yyq,"string",
1742 ((STRING_CONSTANT)(yyq.StackAt(0).m_value)) 1742 ((STRING_CONSTANT)(yyq.StackAt(0).m_value))
1743 .yytext){}} 1743 .yytext){}}
1744 1744
1745public class ListConstant_1 : ListConstant { 1745public class ListConstant_1 : ListConstant {
1746 public ListConstant_1(Parser yyq):base(yyq, 1746 public ListConstant_1(Parser yyq):base(yyq,
1747 ((ArgumentList)(yyq.StackAt(1).m_value)) 1747 ((ArgumentList)(yyq.StackAt(1).m_value))
1748 ){}} 1748 ){}}
1749 1749
1750public class VectorConstant_1 : VectorConstant { 1750public class VectorConstant_1 : VectorConstant {
1751 public VectorConstant_1(Parser yyq):base(yyq, 1751 public VectorConstant_1(Parser yyq):base(yyq,
1752 ((Expression)(yyq.StackAt(5).m_value)) 1752 ((Expression)(yyq.StackAt(5).m_value))
1753 , 1753 ,
1754 ((Expression)(yyq.StackAt(3).m_value)) 1754 ((Expression)(yyq.StackAt(3).m_value))
1755 , 1755 ,
1756 ((Expression)(yyq.StackAt(1).m_value)) 1756 ((Expression)(yyq.StackAt(1).m_value))
1757 ){}} 1757 ){}}
1758 1758
1759public class RotationConstant_1 : RotationConstant { 1759public class RotationConstant_1 : RotationConstant {
1760 public RotationConstant_1(Parser yyq):base(yyq, 1760 public RotationConstant_1(Parser yyq):base(yyq,
1761 ((Expression)(yyq.StackAt(7).m_value)) 1761 ((Expression)(yyq.StackAt(7).m_value))
1762 , 1762 ,
1763 ((Expression)(yyq.StackAt(5).m_value)) 1763 ((Expression)(yyq.StackAt(5).m_value))
1764 , 1764 ,
1765 ((Expression)(yyq.StackAt(3).m_value)) 1765 ((Expression)(yyq.StackAt(3).m_value))
1766 , 1766 ,
1767 ((Expression)(yyq.StackAt(1).m_value)) 1767 ((Expression)(yyq.StackAt(1).m_value))
1768 ){}} 1768 ){}}
1769 1769
1770public class ConstantExpression_1 : ConstantExpression { 1770public class ConstantExpression_1 : ConstantExpression {
1771 public ConstantExpression_1(Parser yyq):base(yyq, 1771 public ConstantExpression_1(Parser yyq):base(yyq,
1772 ((Constant)(yyq.StackAt(0).m_value)) 1772 ((Constant)(yyq.StackAt(0).m_value))
1773 ){}} 1773 ){}}
1774 1774
1775public class IdentExpression_1 : IdentExpression { 1775public class IdentExpression_1 : IdentExpression {
1776 public IdentExpression_1(Parser yyq):base(yyq, 1776 public IdentExpression_1(Parser yyq):base(yyq,
1777 ((IDENT)(yyq.StackAt(0).m_value)) 1777 ((IDENT)(yyq.StackAt(0).m_value))
1778 .yytext){}} 1778 .yytext){}}
1779 1779
1780public class IdentDotExpression_1 : IdentDotExpression { 1780public class IdentDotExpression_1 : IdentDotExpression {
1781 public IdentDotExpression_1(Parser yyq):base(yyq, 1781 public IdentDotExpression_1(Parser yyq):base(yyq,
1782 ((IDENT)(yyq.StackAt(2).m_value)) 1782 ((IDENT)(yyq.StackAt(2).m_value))
1783 .yytext, 1783 .yytext,
1784 ((IDENT)(yyq.StackAt(0).m_value)) 1784 ((IDENT)(yyq.StackAt(0).m_value))
1785 .yytext){}} 1785 .yytext){}}
1786 1786
1787public class IncrementDecrementExpression_1 : IncrementDecrementExpression { 1787public class IncrementDecrementExpression_1 : IncrementDecrementExpression {
1788 public IncrementDecrementExpression_1(Parser yyq):base(yyq, 1788 public IncrementDecrementExpression_1(Parser yyq):base(yyq,
1789 ((IDENT)(yyq.StackAt(1).m_value)) 1789 ((IDENT)(yyq.StackAt(1).m_value))
1790 .yytext, 1790 .yytext,
1791 ((INCREMENT)(yyq.StackAt(0).m_value)) 1791 ((INCREMENT)(yyq.StackAt(0).m_value))
1792 .yytext, true){}} 1792 .yytext, true){}}
1793 1793
1794public class IncrementDecrementExpression_2 : IncrementDecrementExpression { 1794public class IncrementDecrementExpression_2 : IncrementDecrementExpression {
1795 public IncrementDecrementExpression_2(Parser yyq):base(yyq, 1795 public IncrementDecrementExpression_2(Parser yyq):base(yyq,
1796 ((IDENT)(yyq.StackAt(1).m_value)) 1796 ((IDENT)(yyq.StackAt(1).m_value))
1797 .yytext, 1797 .yytext,
1798 ((DECREMENT)(yyq.StackAt(0).m_value)) 1798 ((DECREMENT)(yyq.StackAt(0).m_value))
1799 .yytext, true){}} 1799 .yytext, true){}}
1800 1800
1801public class IncrementDecrementExpression_3 : IncrementDecrementExpression { 1801public class IncrementDecrementExpression_3 : IncrementDecrementExpression {
1802 public IncrementDecrementExpression_3(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1802 public IncrementDecrementExpression_3(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1803)yyq), 1803)yyq),
1804 ((IDENT)(yyq.StackAt(3).m_value)) 1804 ((IDENT)(yyq.StackAt(3).m_value))
1805 .yytext, 1805 .yytext,
1806 ((IDENT)(yyq.StackAt(1).m_value)) 1806 ((IDENT)(yyq.StackAt(1).m_value))
1807 .yytext), 1807 .yytext),
1808 ((INCREMENT)(yyq.StackAt(0).m_value)) 1808 ((INCREMENT)(yyq.StackAt(0).m_value))
1809 .yytext, true){}} 1809 .yytext, true){}}
1810 1810
1811public class IncrementDecrementExpression_4 : IncrementDecrementExpression { 1811public class IncrementDecrementExpression_4 : IncrementDecrementExpression {
1812 public IncrementDecrementExpression_4(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1812 public IncrementDecrementExpression_4(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1813)yyq), 1813)yyq),
1814 ((IDENT)(yyq.StackAt(3).m_value)) 1814 ((IDENT)(yyq.StackAt(3).m_value))
1815 .yytext, 1815 .yytext,
1816 ((IDENT)(yyq.StackAt(1).m_value)) 1816 ((IDENT)(yyq.StackAt(1).m_value))
1817 .yytext), 1817 .yytext),
1818 ((DECREMENT)(yyq.StackAt(0).m_value)) 1818 ((DECREMENT)(yyq.StackAt(0).m_value))
1819 .yytext, true){}} 1819 .yytext, true){}}
1820 1820
1821public class IncrementDecrementExpression_5 : IncrementDecrementExpression { 1821public class IncrementDecrementExpression_5 : IncrementDecrementExpression {
1822 public IncrementDecrementExpression_5(Parser yyq):base(yyq, 1822 public IncrementDecrementExpression_5(Parser yyq):base(yyq,
1823 ((IDENT)(yyq.StackAt(0).m_value)) 1823 ((IDENT)(yyq.StackAt(0).m_value))
1824 .yytext, 1824 .yytext,
1825 ((INCREMENT)(yyq.StackAt(1).m_value)) 1825 ((INCREMENT)(yyq.StackAt(1).m_value))
1826 .yytext, false){}} 1826 .yytext, false){}}
1827 1827
1828public class IncrementDecrementExpression_6 : IncrementDecrementExpression { 1828public class IncrementDecrementExpression_6 : IncrementDecrementExpression {
1829 public IncrementDecrementExpression_6(Parser yyq):base(yyq, 1829 public IncrementDecrementExpression_6(Parser yyq):base(yyq,
1830 ((IDENT)(yyq.StackAt(0).m_value)) 1830 ((IDENT)(yyq.StackAt(0).m_value))
1831 .yytext, 1831 .yytext,
1832 ((DECREMENT)(yyq.StackAt(1).m_value)) 1832 ((DECREMENT)(yyq.StackAt(1).m_value))
1833 .yytext, false){}} 1833 .yytext, false){}}
1834 1834
1835public class IncrementDecrementExpression_7 : IncrementDecrementExpression { 1835public class IncrementDecrementExpression_7 : IncrementDecrementExpression {
1836 public IncrementDecrementExpression_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1836 public IncrementDecrementExpression_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1837)yyq), 1837)yyq),
1838 ((IDENT)(yyq.StackAt(2).m_value)) 1838 ((IDENT)(yyq.StackAt(2).m_value))
1839 .yytext, 1839 .yytext,
1840 ((IDENT)(yyq.StackAt(0).m_value)) 1840 ((IDENT)(yyq.StackAt(0).m_value))
1841 .yytext), 1841 .yytext),
1842 ((INCREMENT)(yyq.StackAt(3).m_value)) 1842 ((INCREMENT)(yyq.StackAt(3).m_value))
1843 .yytext, false){}} 1843 .yytext, false){}}
1844 1844
1845public class IncrementDecrementExpression_8 : IncrementDecrementExpression { 1845public class IncrementDecrementExpression_8 : IncrementDecrementExpression {
1846 public IncrementDecrementExpression_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax 1846 public IncrementDecrementExpression_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax
1847)yyq), 1847)yyq),
1848 ((IDENT)(yyq.StackAt(2).m_value)) 1848 ((IDENT)(yyq.StackAt(2).m_value))
1849 .yytext, 1849 .yytext,
1850 ((IDENT)(yyq.StackAt(0).m_value)) 1850 ((IDENT)(yyq.StackAt(0).m_value))
1851 .yytext), 1851 .yytext),
1852 ((DECREMENT)(yyq.StackAt(3).m_value)) 1852 ((DECREMENT)(yyq.StackAt(3).m_value))
1853 .yytext, false){}} 1853 .yytext, false){}}
1854 1854
1855public class FunctionCallExpression_1 : FunctionCallExpression { 1855public class FunctionCallExpression_1 : FunctionCallExpression {
1856 public FunctionCallExpression_1(Parser yyq):base(yyq, 1856 public FunctionCallExpression_1(Parser yyq):base(yyq,
1857 ((FunctionCall)(yyq.StackAt(0).m_value)) 1857 ((FunctionCall)(yyq.StackAt(0).m_value))
1858 ){}} 1858 ){}}
1859 1859
1860public class BinaryExpression_1 : BinaryExpression { 1860public class BinaryExpression_1 : BinaryExpression {
1861 public BinaryExpression_1(Parser yyq):base(yyq, 1861 public BinaryExpression_1(Parser yyq):base(yyq,
1862 ((Expression)(yyq.StackAt(2).m_value)) 1862 ((Expression)(yyq.StackAt(2).m_value))
1863 , 1863 ,
1864 ((Expression)(yyq.StackAt(0).m_value)) 1864 ((Expression)(yyq.StackAt(0).m_value))
1865 , 1865 ,
1866 ((PLUS)(yyq.StackAt(1).m_value)) 1866 ((PLUS)(yyq.StackAt(1).m_value))
1867 .yytext){}} 1867 .yytext){}}
1868 1868
1869public class BinaryExpression_2 : BinaryExpression { 1869public class BinaryExpression_2 : BinaryExpression {
1870 public BinaryExpression_2(Parser yyq):base(yyq, 1870 public BinaryExpression_2(Parser yyq):base(yyq,
1871 ((Expression)(yyq.StackAt(2).m_value)) 1871 ((Expression)(yyq.StackAt(2).m_value))
1872 , 1872 ,
1873 ((Expression)(yyq.StackAt(0).m_value)) 1873 ((Expression)(yyq.StackAt(0).m_value))
1874 , 1874 ,
1875 ((MINUS)(yyq.StackAt(1).m_value)) 1875 ((MINUS)(yyq.StackAt(1).m_value))
1876 .yytext){}} 1876 .yytext){}}
1877 1877
1878public class BinaryExpression_3 : BinaryExpression { 1878public class BinaryExpression_3 : BinaryExpression {
1879 public BinaryExpression_3(Parser yyq):base(yyq, 1879 public BinaryExpression_3(Parser yyq):base(yyq,
1880 ((Expression)(yyq.StackAt(2).m_value)) 1880 ((Expression)(yyq.StackAt(2).m_value))
1881 , 1881 ,
1882 ((Expression)(yyq.StackAt(0).m_value)) 1882 ((Expression)(yyq.StackAt(0).m_value))
1883 , 1883 ,
1884 ((STAR)(yyq.StackAt(1).m_value)) 1884 ((STAR)(yyq.StackAt(1).m_value))
1885 .yytext){}} 1885 .yytext){}}
1886 1886
1887public class BinaryExpression_4 : BinaryExpression { 1887public class BinaryExpression_4 : BinaryExpression {
1888 public BinaryExpression_4(Parser yyq):base(yyq, 1888 public BinaryExpression_4(Parser yyq):base(yyq,
1889 ((Expression)(yyq.StackAt(2).m_value)) 1889 ((Expression)(yyq.StackAt(2).m_value))
1890 , 1890 ,
1891 ((Expression)(yyq.StackAt(0).m_value)) 1891 ((Expression)(yyq.StackAt(0).m_value))
1892 , 1892 ,
1893 ((SLASH)(yyq.StackAt(1).m_value)) 1893 ((SLASH)(yyq.StackAt(1).m_value))
1894 .yytext){}} 1894 .yytext){}}
1895 1895
1896public class BinaryExpression_5 : BinaryExpression { 1896public class BinaryExpression_5 : BinaryExpression {
1897 public BinaryExpression_5(Parser yyq):base(yyq, 1897 public BinaryExpression_5(Parser yyq):base(yyq,
1898 ((Expression)(yyq.StackAt(2).m_value)) 1898 ((Expression)(yyq.StackAt(2).m_value))
1899 , 1899 ,
1900 ((Expression)(yyq.StackAt(0).m_value)) 1900 ((Expression)(yyq.StackAt(0).m_value))
1901 , 1901 ,
1902 ((PERCENT)(yyq.StackAt(1).m_value)) 1902 ((PERCENT)(yyq.StackAt(1).m_value))
1903 .yytext){}} 1903 .yytext){}}
1904 1904
1905public class BinaryExpression_6 : BinaryExpression { 1905public class BinaryExpression_6 : BinaryExpression {
1906 public BinaryExpression_6(Parser yyq):base(yyq, 1906 public BinaryExpression_6(Parser yyq):base(yyq,
1907 ((Expression)(yyq.StackAt(2).m_value)) 1907 ((Expression)(yyq.StackAt(2).m_value))
1908 , 1908 ,
1909 ((Expression)(yyq.StackAt(0).m_value)) 1909 ((Expression)(yyq.StackAt(0).m_value))
1910 , 1910 ,
1911 ((AMP)(yyq.StackAt(1).m_value)) 1911 ((AMP)(yyq.StackAt(1).m_value))
1912 .yytext){}} 1912 .yytext){}}
1913 1913
1914public class BinaryExpression_7 : BinaryExpression { 1914public class BinaryExpression_7 : BinaryExpression {
1915 public BinaryExpression_7(Parser yyq):base(yyq, 1915 public BinaryExpression_7(Parser yyq):base(yyq,
1916 ((Expression)(yyq.StackAt(2).m_value)) 1916 ((Expression)(yyq.StackAt(2).m_value))
1917 , 1917 ,
1918 ((Expression)(yyq.StackAt(0).m_value)) 1918 ((Expression)(yyq.StackAt(0).m_value))
1919 , 1919 ,
1920 ((STROKE)(yyq.StackAt(1).m_value)) 1920 ((STROKE)(yyq.StackAt(1).m_value))
1921 .yytext){}} 1921 .yytext){}}
1922 1922
1923public class BinaryExpression_8 : BinaryExpression { 1923public class BinaryExpression_8 : BinaryExpression {
1924 public BinaryExpression_8(Parser yyq):base(yyq, 1924 public BinaryExpression_8(Parser yyq):base(yyq,
1925 ((Expression)(yyq.StackAt(2).m_value)) 1925 ((Expression)(yyq.StackAt(2).m_value))
1926 , 1926 ,
1927 ((Expression)(yyq.StackAt(0).m_value)) 1927 ((Expression)(yyq.StackAt(0).m_value))
1928 , 1928 ,
1929 ((CARET)(yyq.StackAt(1).m_value)) 1929 ((CARET)(yyq.StackAt(1).m_value))
1930 .yytext){}} 1930 .yytext){}}
1931 1931
1932public class BinaryExpression_9 : BinaryExpression { 1932public class BinaryExpression_9 : BinaryExpression {
1933 public BinaryExpression_9(Parser yyq):base(yyq, 1933 public BinaryExpression_9(Parser yyq):base(yyq,
1934 ((Expression)(yyq.StackAt(2).m_value)) 1934 ((Expression)(yyq.StackAt(2).m_value))
1935 , 1935 ,
1936 ((Expression)(yyq.StackAt(0).m_value)) 1936 ((Expression)(yyq.StackAt(0).m_value))
1937 , 1937 ,
1938 ((RIGHT_ANGLE)(yyq.StackAt(1).m_value)) 1938 ((RIGHT_ANGLE)(yyq.StackAt(1).m_value))
1939 .yytext){}} 1939 .yytext){}}
1940 1940
1941public class BinaryExpression_10 : BinaryExpression { 1941public class BinaryExpression_10 : BinaryExpression {
1942 public BinaryExpression_10(Parser yyq):base(yyq, 1942 public BinaryExpression_10(Parser yyq):base(yyq,
1943 ((Expression)(yyq.StackAt(2).m_value)) 1943 ((Expression)(yyq.StackAt(2).m_value))
1944 , 1944 ,
1945 ((Expression)(yyq.StackAt(0).m_value)) 1945 ((Expression)(yyq.StackAt(0).m_value))
1946 , 1946 ,
1947 ((LEFT_ANGLE)(yyq.StackAt(1).m_value)) 1947 ((LEFT_ANGLE)(yyq.StackAt(1).m_value))
1948 .yytext){}} 1948 .yytext){}}
1949 1949
1950public class BinaryExpression_11 : BinaryExpression { 1950public class BinaryExpression_11 : BinaryExpression {
1951 public BinaryExpression_11(Parser yyq):base(yyq, 1951 public BinaryExpression_11(Parser yyq):base(yyq,
1952 ((Expression)(yyq.StackAt(2).m_value)) 1952 ((Expression)(yyq.StackAt(2).m_value))
1953 , 1953 ,
1954 ((Expression)(yyq.StackAt(0).m_value)) 1954 ((Expression)(yyq.StackAt(0).m_value))
1955 , 1955 ,
1956 ((EQUALS_EQUALS)(yyq.StackAt(1).m_value)) 1956 ((EQUALS_EQUALS)(yyq.StackAt(1).m_value))
1957 .yytext){}} 1957 .yytext){}}
1958 1958
1959public class BinaryExpression_12 : BinaryExpression { 1959public class BinaryExpression_12 : BinaryExpression {
1960 public BinaryExpression_12(Parser yyq):base(yyq, 1960 public BinaryExpression_12(Parser yyq):base(yyq,
1961 ((Expression)(yyq.StackAt(2).m_value)) 1961 ((Expression)(yyq.StackAt(2).m_value))
1962 , 1962 ,
1963 ((Expression)(yyq.StackAt(0).m_value)) 1963 ((Expression)(yyq.StackAt(0).m_value))
1964 , 1964 ,
1965 ((EXCLAMATION_EQUALS)(yyq.StackAt(1).m_value)) 1965 ((EXCLAMATION_EQUALS)(yyq.StackAt(1).m_value))
1966 .yytext){}} 1966 .yytext){}}
1967 1967
1968public class BinaryExpression_13 : BinaryExpression { 1968public class BinaryExpression_13 : BinaryExpression {
1969 public BinaryExpression_13(Parser yyq):base(yyq, 1969 public BinaryExpression_13(Parser yyq):base(yyq,
1970 ((Expression)(yyq.StackAt(2).m_value)) 1970 ((Expression)(yyq.StackAt(2).m_value))
1971 , 1971 ,
1972 ((Expression)(yyq.StackAt(0).m_value)) 1972 ((Expression)(yyq.StackAt(0).m_value))
1973 , 1973 ,
1974 ((LESS_EQUALS)(yyq.StackAt(1).m_value)) 1974 ((LESS_EQUALS)(yyq.StackAt(1).m_value))
1975 .yytext){}} 1975 .yytext){}}
1976 1976
1977public class BinaryExpression_14 : BinaryExpression { 1977public class BinaryExpression_14 : BinaryExpression {
1978 public BinaryExpression_14(Parser yyq):base(yyq, 1978 public BinaryExpression_14(Parser yyq):base(yyq,
1979 ((Expression)(yyq.StackAt(2).m_value)) 1979 ((Expression)(yyq.StackAt(2).m_value))
1980 , 1980 ,
1981 ((Expression)(yyq.StackAt(0).m_value)) 1981 ((Expression)(yyq.StackAt(0).m_value))
1982 , 1982 ,
1983 ((GREATER_EQUALS)(yyq.StackAt(1).m_value)) 1983 ((GREATER_EQUALS)(yyq.StackAt(1).m_value))
1984 .yytext){}} 1984 .yytext){}}
1985 1985
1986public class BinaryExpression_15 : BinaryExpression { 1986public class BinaryExpression_15 : BinaryExpression {
1987 public BinaryExpression_15(Parser yyq):base(yyq, 1987 public BinaryExpression_15(Parser yyq):base(yyq,
1988 ((Expression)(yyq.StackAt(2).m_value)) 1988 ((Expression)(yyq.StackAt(2).m_value))
1989 , 1989 ,
1990 ((Expression)(yyq.StackAt(0).m_value)) 1990 ((Expression)(yyq.StackAt(0).m_value))
1991 , 1991 ,
1992 ((AMP_AMP)(yyq.StackAt(1).m_value)) 1992 ((AMP_AMP)(yyq.StackAt(1).m_value))
1993 .yytext){}} 1993 .yytext){}}
1994 1994
1995public class BinaryExpression_16 : BinaryExpression { 1995public class BinaryExpression_16 : BinaryExpression {
1996 public BinaryExpression_16(Parser yyq):base(yyq, 1996 public BinaryExpression_16(Parser yyq):base(yyq,
1997 ((Expression)(yyq.StackAt(2).m_value)) 1997 ((Expression)(yyq.StackAt(2).m_value))
1998 , 1998 ,
1999 ((Expression)(yyq.StackAt(0).m_value)) 1999 ((Expression)(yyq.StackAt(0).m_value))
2000 , 2000 ,
2001 ((STROKE_STROKE)(yyq.StackAt(1).m_value)) 2001 ((STROKE_STROKE)(yyq.StackAt(1).m_value))
2002 .yytext){}} 2002 .yytext){}}
2003 2003
2004public class BinaryExpression_17 : BinaryExpression { 2004public class BinaryExpression_17 : BinaryExpression {
2005 public BinaryExpression_17(Parser yyq):base(yyq, 2005 public BinaryExpression_17(Parser yyq):base(yyq,
2006 ((Expression)(yyq.StackAt(2).m_value)) 2006 ((Expression)(yyq.StackAt(2).m_value))
2007 , 2007 ,
2008 ((Expression)(yyq.StackAt(0).m_value)) 2008 ((Expression)(yyq.StackAt(0).m_value))
2009 , 2009 ,
2010 ((LEFT_SHIFT)(yyq.StackAt(1).m_value)) 2010 ((LEFT_SHIFT)(yyq.StackAt(1).m_value))
2011 .yytext){}} 2011 .yytext){}}
2012 2012
2013public class BinaryExpression_18 : BinaryExpression { 2013public class BinaryExpression_18 : BinaryExpression {
2014 public BinaryExpression_18(Parser yyq):base(yyq, 2014 public BinaryExpression_18(Parser yyq):base(yyq,
2015 ((Expression)(yyq.StackAt(2).m_value)) 2015 ((Expression)(yyq.StackAt(2).m_value))
2016 , 2016 ,
2017 ((Expression)(yyq.StackAt(0).m_value)) 2017 ((Expression)(yyq.StackAt(0).m_value))
2018 , 2018 ,
2019 ((RIGHT_SHIFT)(yyq.StackAt(1).m_value)) 2019 ((RIGHT_SHIFT)(yyq.StackAt(1).m_value))
2020 .yytext){}} 2020 .yytext){}}
2021 2021
2022public class UnaryExpression_1 : UnaryExpression { 2022public class UnaryExpression_1 : UnaryExpression {
2023 public UnaryExpression_1(Parser yyq):base(yyq, 2023 public UnaryExpression_1(Parser yyq):base(yyq,
2024 ((EXCLAMATION)(yyq.StackAt(1).m_value)) 2024 ((EXCLAMATION)(yyq.StackAt(1).m_value))
2025 .yytext, 2025 .yytext,
2026 ((Expression)(yyq.StackAt(0).m_value)) 2026 ((Expression)(yyq.StackAt(0).m_value))
2027 ){}} 2027 ){}}
2028 2028
2029public class UnaryExpression_2 : UnaryExpression { 2029public class UnaryExpression_2 : UnaryExpression {
2030 public UnaryExpression_2(Parser yyq):base(yyq, 2030 public UnaryExpression_2(Parser yyq):base(yyq,
2031 ((MINUS)(yyq.StackAt(1).m_value)) 2031 ((MINUS)(yyq.StackAt(1).m_value))
2032 .yytext, 2032 .yytext,
2033 ((Expression)(yyq.StackAt(0).m_value)) 2033 ((Expression)(yyq.StackAt(0).m_value))
2034 ){}} 2034 ){}}
2035 2035
2036public class UnaryExpression_3 : UnaryExpression { 2036public class UnaryExpression_3 : UnaryExpression {
2037 public UnaryExpression_3(Parser yyq):base(yyq, 2037 public UnaryExpression_3(Parser yyq):base(yyq,
2038 ((TILDE)(yyq.StackAt(1).m_value)) 2038 ((TILDE)(yyq.StackAt(1).m_value))
2039 .yytext, 2039 .yytext,
2040 ((Expression)(yyq.StackAt(0).m_value)) 2040 ((Expression)(yyq.StackAt(0).m_value))
2041 ){}} 2041 ){}}
2042 2042
2043public class ParenthesisExpression_1 : ParenthesisExpression { 2043public class ParenthesisExpression_1 : ParenthesisExpression {
2044 public ParenthesisExpression_1(Parser yyq):base(yyq, 2044 public ParenthesisExpression_1(Parser yyq):base(yyq,
2045 ((Expression)(yyq.StackAt(1).m_value)) 2045 ((Expression)(yyq.StackAt(1).m_value))
2046 ){}} 2046 ){}}
2047 2047
2048public class ParenthesisExpression_2 : ParenthesisExpression { 2048public class ParenthesisExpression_2 : ParenthesisExpression {
2049 public ParenthesisExpression_2(Parser yyq):base(yyq, 2049 public ParenthesisExpression_2(Parser yyq):base(yyq,
2050 ((SimpleAssignment)(yyq.StackAt(1).m_value)) 2050 ((SimpleAssignment)(yyq.StackAt(1).m_value))
2051 ){}} 2051 ){}}
2052 2052
2053public class TypecastExpression_1 : TypecastExpression { 2053public class TypecastExpression_1 : TypecastExpression {
2054 public TypecastExpression_1(Parser yyq):base(yyq, 2054 public TypecastExpression_1(Parser yyq):base(yyq,
2055 ((Typename)(yyq.StackAt(2).m_value)) 2055 ((Typename)(yyq.StackAt(2).m_value))
2056 .yytext, 2056 .yytext,
2057 ((Constant)(yyq.StackAt(0).m_value)) 2057 ((Constant)(yyq.StackAt(0).m_value))
2058 ){}} 2058 ){}}
2059 2059
2060public class TypecastExpression_2 : TypecastExpression { 2060public class TypecastExpression_2 : TypecastExpression {
2061 public TypecastExpression_2(Parser yyq):base(yyq, 2061 public TypecastExpression_2(Parser yyq):base(yyq,
2062 ((Typename)(yyq.StackAt(2).m_value)) 2062 ((Typename)(yyq.StackAt(2).m_value))
2063 .yytext, new IdentExpression(((LSLSyntax 2063 .yytext, new IdentExpression(((LSLSyntax
2064)yyq), 2064)yyq),
2065 ((IDENT)(yyq.StackAt(0).m_value)) 2065 ((IDENT)(yyq.StackAt(0).m_value))
2066 .yytext)){}} 2066 .yytext)){}}
2067 2067
2068public class TypecastExpression_3 : TypecastExpression { 2068public class TypecastExpression_3 : TypecastExpression {
2069 public TypecastExpression_3(Parser yyq):base(yyq, 2069 public TypecastExpression_3(Parser yyq):base(yyq,
2070 ((Typename)(yyq.StackAt(4).m_value)) 2070 ((Typename)(yyq.StackAt(4).m_value))
2071 .yytext, new IdentDotExpression(((LSLSyntax 2071 .yytext, new IdentDotExpression(((LSLSyntax
2072)yyq), 2072)yyq),
2073 ((IDENT)(yyq.StackAt(2).m_value)) 2073 ((IDENT)(yyq.StackAt(2).m_value))
2074 .yytext, 2074 .yytext,
2075 ((IDENT)(yyq.StackAt(0).m_value)) 2075 ((IDENT)(yyq.StackAt(0).m_value))
2076 .yytext)){}} 2076 .yytext)){}}
2077 2077
2078public class TypecastExpression_4 : TypecastExpression { 2078public class TypecastExpression_4 : TypecastExpression {
2079 public TypecastExpression_4(Parser yyq):base(yyq, 2079 public TypecastExpression_4(Parser yyq):base(yyq,
2080 ((Typename)(yyq.StackAt(3).m_value)) 2080 ((Typename)(yyq.StackAt(3).m_value))
2081 .yytext, new IncrementDecrementExpression(((LSLSyntax 2081 .yytext, new IncrementDecrementExpression(((LSLSyntax
2082)yyq), 2082)yyq),
2083 ((IDENT)(yyq.StackAt(1).m_value)) 2083 ((IDENT)(yyq.StackAt(1).m_value))
2084 .yytext, 2084 .yytext,
2085 ((INCREMENT)(yyq.StackAt(0).m_value)) 2085 ((INCREMENT)(yyq.StackAt(0).m_value))
2086 .yytext, true)){}} 2086 .yytext, true)){}}
2087 2087
2088public class TypecastExpression_5 : TypecastExpression { 2088public class TypecastExpression_5 : TypecastExpression {
2089 public TypecastExpression_5(Parser yyq):base(yyq, 2089 public TypecastExpression_5(Parser yyq):base(yyq,
2090 ((Typename)(yyq.StackAt(5).m_value)) 2090 ((Typename)(yyq.StackAt(5).m_value))
2091 .yytext, new IncrementDecrementExpression(((LSLSyntax 2091 .yytext, new IncrementDecrementExpression(((LSLSyntax
2092)yyq), new IdentDotExpression(((LSLSyntax 2092)yyq), new IdentDotExpression(((LSLSyntax
2093)yyq), 2093)yyq),
2094 ((IDENT)(yyq.StackAt(3).m_value)) 2094 ((IDENT)(yyq.StackAt(3).m_value))
2095 .yytext, 2095 .yytext,
2096 ((IDENT)(yyq.StackAt(1).m_value)) 2096 ((IDENT)(yyq.StackAt(1).m_value))
2097 .yytext), 2097 .yytext),
2098 ((INCREMENT)(yyq.StackAt(0).m_value)) 2098 ((INCREMENT)(yyq.StackAt(0).m_value))
2099 .yytext, true)){}} 2099 .yytext, true)){}}
2100 2100
2101public class TypecastExpression_6 : TypecastExpression { 2101public class TypecastExpression_6 : TypecastExpression {
2102 public TypecastExpression_6(Parser yyq):base(yyq, 2102 public TypecastExpression_6(Parser yyq):base(yyq,
2103 ((Typename)(yyq.StackAt(3).m_value)) 2103 ((Typename)(yyq.StackAt(3).m_value))
2104 .yytext, new IncrementDecrementExpression(((LSLSyntax 2104 .yytext, new IncrementDecrementExpression(((LSLSyntax
2105)yyq), 2105)yyq),
2106 ((IDENT)(yyq.StackAt(1).m_value)) 2106 ((IDENT)(yyq.StackAt(1).m_value))
2107 .yytext, 2107 .yytext,
2108 ((DECREMENT)(yyq.StackAt(0).m_value)) 2108 ((DECREMENT)(yyq.StackAt(0).m_value))
2109 .yytext, true)){}} 2109 .yytext, true)){}}
2110 2110
2111public class TypecastExpression_7 : TypecastExpression { 2111public class TypecastExpression_7 : TypecastExpression {
2112 public TypecastExpression_7(Parser yyq):base(yyq, 2112 public TypecastExpression_7(Parser yyq):base(yyq,
2113 ((Typename)(yyq.StackAt(5).m_value)) 2113 ((Typename)(yyq.StackAt(5).m_value))
2114 .yytext, new IncrementDecrementExpression(((LSLSyntax 2114 .yytext, new IncrementDecrementExpression(((LSLSyntax
2115)yyq), new IdentDotExpression(((LSLSyntax 2115)yyq), new IdentDotExpression(((LSLSyntax
2116)yyq), 2116)yyq),
2117 ((IDENT)(yyq.StackAt(3).m_value)) 2117 ((IDENT)(yyq.StackAt(3).m_value))
2118 .yytext, 2118 .yytext,
2119 ((IDENT)(yyq.StackAt(1).m_value)) 2119 ((IDENT)(yyq.StackAt(1).m_value))
2120 .yytext), 2120 .yytext),
2121 ((DECREMENT)(yyq.StackAt(0).m_value)) 2121 ((DECREMENT)(yyq.StackAt(0).m_value))
2122 .yytext, true)){}} 2122 .yytext, true)){}}
2123 2123
2124public class TypecastExpression_8 : TypecastExpression { 2124public class TypecastExpression_8 : TypecastExpression {
2125 public TypecastExpression_8(Parser yyq):base(yyq, 2125 public TypecastExpression_8(Parser yyq):base(yyq,
2126 ((Typename)(yyq.StackAt(2).m_value)) 2126 ((Typename)(yyq.StackAt(2).m_value))
2127 .yytext, 2127 .yytext,
2128 ((FunctionCall)(yyq.StackAt(0).m_value)) 2128 ((FunctionCall)(yyq.StackAt(0).m_value))
2129 ){}} 2129 ){}}
2130 2130
2131public class TypecastExpression_9 : TypecastExpression { 2131public class TypecastExpression_9 : TypecastExpression {
2132 public TypecastExpression_9(Parser yyq):base(yyq, 2132 public TypecastExpression_9(Parser yyq):base(yyq,
2133 ((Typename)(yyq.StackAt(4).m_value)) 2133 ((Typename)(yyq.StackAt(4).m_value))
2134 .yytext, 2134 .yytext,
2135 ((Expression)(yyq.StackAt(1).m_value)) 2135 ((Expression)(yyq.StackAt(1).m_value))
2136 ){}} 2136 ){}}
2137 2137
2138public class FunctionCall_1 : FunctionCall { 2138public class FunctionCall_1 : FunctionCall {
2139 public FunctionCall_1(Parser yyq):base(yyq, 2139 public FunctionCall_1(Parser yyq):base(yyq,
2140 ((IDENT)(yyq.StackAt(3).m_value)) 2140 ((IDENT)(yyq.StackAt(3).m_value))
2141 .yytext, 2141 .yytext,
2142 ((ArgumentList)(yyq.StackAt(1).m_value)) 2142 ((ArgumentList)(yyq.StackAt(1).m_value))
2143 ){}} 2143 ){}}
2144 2144
2145public class ArgumentList_1 : ArgumentList { 2145public class ArgumentList_1 : ArgumentList {
2146 public ArgumentList_1(Parser yyq):base(yyq, 2146 public ArgumentList_1(Parser yyq):base(yyq,
2147 ((Argument)(yyq.StackAt(0).m_value)) 2147 ((Argument)(yyq.StackAt(0).m_value))
2148 ){}} 2148 ){}}
2149 2149
2150public class ArgumentList_2 : ArgumentList { 2150public class ArgumentList_2 : ArgumentList {
2151 public ArgumentList_2(Parser yyq):base(yyq, 2151 public ArgumentList_2(Parser yyq):base(yyq,
2152 ((ArgumentList)(yyq.StackAt(2).m_value)) 2152 ((ArgumentList)(yyq.StackAt(2).m_value))
2153 , 2153 ,
2154 ((Argument)(yyq.StackAt(0).m_value)) 2154 ((Argument)(yyq.StackAt(0).m_value))
2155 ){}} 2155 ){}}
2156 2156
2157public class ExpressionArgument_1 : ExpressionArgument { 2157public class ExpressionArgument_1 : ExpressionArgument {
2158 public ExpressionArgument_1(Parser yyq):base(yyq, 2158 public ExpressionArgument_1(Parser yyq):base(yyq,
2159 ((Expression)(yyq.StackAt(0).m_value)) 2159 ((Expression)(yyq.StackAt(0).m_value))
2160 ){}} 2160 ){}}
2161 2161
2162public class Typename_1 : Typename { 2162public class Typename_1 : Typename {
2163 public Typename_1(Parser yyq):base(yyq, 2163 public Typename_1(Parser yyq):base(yyq,
2164 ((INTEGER_TYPE)(yyq.StackAt(0).m_value)) 2164 ((INTEGER_TYPE)(yyq.StackAt(0).m_value))
2165 .yytext){}} 2165 .yytext){}}
2166 2166
2167public class Typename_2 : Typename { 2167public class Typename_2 : Typename {
2168 public Typename_2(Parser yyq):base(yyq, 2168 public Typename_2(Parser yyq):base(yyq,
2169 ((FLOAT_TYPE)(yyq.StackAt(0).m_value)) 2169 ((FLOAT_TYPE)(yyq.StackAt(0).m_value))
2170 .yytext){}} 2170 .yytext){}}
2171 2171
2172public class Typename_3 : Typename { 2172public class Typename_3 : Typename {
2173 public Typename_3(Parser yyq):base(yyq, 2173 public Typename_3(Parser yyq):base(yyq,
2174 ((STRING_TYPE)(yyq.StackAt(0).m_value)) 2174 ((STRING_TYPE)(yyq.StackAt(0).m_value))
2175 .yytext){}} 2175 .yytext){}}
2176 2176
2177public class Typename_4 : Typename { 2177public class Typename_4 : Typename {
2178 public Typename_4(Parser yyq):base(yyq, 2178 public Typename_4(Parser yyq):base(yyq,
2179 ((KEY_TYPE)(yyq.StackAt(0).m_value)) 2179 ((KEY_TYPE)(yyq.StackAt(0).m_value))
2180 .yytext){}} 2180 .yytext){}}
2181 2181
2182public class Typename_5 : Typename { 2182public class Typename_5 : Typename {
2183 public Typename_5(Parser yyq):base(yyq, 2183 public Typename_5(Parser yyq):base(yyq,
2184 ((VECTOR_TYPE)(yyq.StackAt(0).m_value)) 2184 ((VECTOR_TYPE)(yyq.StackAt(0).m_value))
2185 .yytext){}} 2185 .yytext){}}
2186 2186
2187public class Typename_6 : Typename { 2187public class Typename_6 : Typename {
2188 public Typename_6(Parser yyq):base(yyq, 2188 public Typename_6(Parser yyq):base(yyq,
2189 ((ROTATION_TYPE)(yyq.StackAt(0).m_value)) 2189 ((ROTATION_TYPE)(yyq.StackAt(0).m_value))
2190 .yytext){}} 2190 .yytext){}}
2191 2191
2192public class Typename_7 : Typename { 2192public class Typename_7 : Typename {
2193 public Typename_7(Parser yyq):base(yyq, 2193 public Typename_7(Parser yyq):base(yyq,
2194 ((LIST_TYPE)(yyq.StackAt(0).m_value)) 2194 ((LIST_TYPE)(yyq.StackAt(0).m_value))
2195 .yytext){}} 2195 .yytext){}}
2196 2196
2197public class Event_1 : Event { 2197public class Event_1 : Event {
2198 public Event_1(Parser yyq):base(yyq, 2198 public Event_1(Parser yyq):base(yyq,
2199 ((DATASERVER_EVENT)(yyq.StackAt(0).m_value)) 2199 ((DATASERVER_EVENT)(yyq.StackAt(0).m_value))
2200 .yytext){}} 2200 .yytext){}}
2201 2201
2202public class Event_2 : Event { 2202public class Event_2 : Event {
2203 public Event_2(Parser yyq):base(yyq, 2203 public Event_2(Parser yyq):base(yyq,
2204 ((EMAIL_EVENT)(yyq.StackAt(0).m_value)) 2204 ((EMAIL_EVENT)(yyq.StackAt(0).m_value))
2205 .yytext){}} 2205 .yytext){}}
2206 2206
2207public class Event_3 : Event { 2207public class Event_3 : Event {
2208 public Event_3(Parser yyq):base(yyq, 2208 public Event_3(Parser yyq):base(yyq,
2209 ((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value)) 2209 ((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value))
2210 .yytext){}} 2210 .yytext){}}
2211 2211
2212public class Event_4 : Event { 2212public class Event_4 : Event {
2213 public Event_4(Parser yyq):base(yyq, 2213 public Event_4(Parser yyq):base(yyq,
2214 ((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value)) 2214 ((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value))
2215 .yytext){}} 2215 .yytext){}}
2216 2216
2217public class Event_5 : Event { 2217public class Event_5 : Event {
2218 public Event_5(Parser yyq):base(yyq, 2218 public Event_5(Parser yyq):base(yyq,
2219 ((LISTEN_EVENT)(yyq.StackAt(0).m_value)) 2219 ((LISTEN_EVENT)(yyq.StackAt(0).m_value))
2220 .yytext){}} 2220 .yytext){}}
2221 2221
2222public class Event_6 : Event { 2222public class Event_6 : Event {
2223 public Event_6(Parser yyq):base(yyq, 2223 public Event_6(Parser yyq):base(yyq,
2224 ((MONEY_EVENT)(yyq.StackAt(0).m_value)) 2224 ((MONEY_EVENT)(yyq.StackAt(0).m_value))
2225 .yytext){}} 2225 .yytext){}}
2226 2226
2227public class Event_7 : Event { 2227public class Event_7 : Event {
2228 public Event_7(Parser yyq):base(yyq, 2228 public Event_7(Parser yyq):base(yyq,
2229 ((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value)) 2229 ((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value))
2230 .yytext){}} 2230 .yytext){}}
2231 2231
2232public class Event_8 : Event { 2232public class Event_8 : Event {
2233 public Event_8(Parser yyq):base(yyq, 2233 public Event_8(Parser yyq):base(yyq,
2234 ((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value)) 2234 ((HTTP_REQUEST_EVENT)(yyq.StackAt(0).m_value))
2235 .yytext){}} 2235 .yytext){}}
2236 2236
2237public class Event_9 : Event { 2237public class Event_9 : Event {
2238 public Event_9(Parser yyq):base(yyq, 2238 public Event_9(Parser yyq):base(yyq,
2239 ((TRANSACTION_RESULT_EVENT)(yyq.StackAt(0).m_value)) 2239 ((TRANSACTION_RESULT_EVENT)(yyq.StackAt(0).m_value))
2240 .yytext){}} 2240 .yytext){}}
2241 2241
2242public class VoidArgEvent_1 : VoidArgEvent { 2242public class VoidArgEvent_1 : VoidArgEvent {
2243 public VoidArgEvent_1(Parser yyq):base(yyq, 2243 public VoidArgEvent_1(Parser yyq):base(yyq,
2244 ((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value)) 2244 ((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value))
2245 .yytext){}} 2245 .yytext){}}
2246 2246
2247public class VoidArgEvent_2 : VoidArgEvent { 2247public class VoidArgEvent_2 : VoidArgEvent {
2248 public VoidArgEvent_2(Parser yyq):base(yyq, 2248 public VoidArgEvent_2(Parser yyq):base(yyq,
2249 ((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value)) 2249 ((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value))
2250 .yytext){}} 2250 .yytext){}}
2251 2251
2252public class VoidArgEvent_3 : VoidArgEvent { 2252public class VoidArgEvent_3 : VoidArgEvent {
2253 public VoidArgEvent_3(Parser yyq):base(yyq, 2253 public VoidArgEvent_3(Parser yyq):base(yyq,
2254 ((MOVING_END_EVENT)(yyq.StackAt(0).m_value)) 2254 ((MOVING_END_EVENT)(yyq.StackAt(0).m_value))
2255 .yytext){}} 2255 .yytext){}}
2256 2256
2257public class VoidArgEvent_4 : VoidArgEvent { 2257public class VoidArgEvent_4 : VoidArgEvent {
2258 public VoidArgEvent_4(Parser yyq):base(yyq, 2258 public VoidArgEvent_4(Parser yyq):base(yyq,
2259 ((MOVING_START_EVENT)(yyq.StackAt(0).m_value)) 2259 ((MOVING_START_EVENT)(yyq.StackAt(0).m_value))
2260 .yytext){}} 2260 .yytext){}}
2261 2261
2262public class VoidArgEvent_5 : VoidArgEvent { 2262public class VoidArgEvent_5 : VoidArgEvent {
2263 public VoidArgEvent_5(Parser yyq):base(yyq, 2263 public VoidArgEvent_5(Parser yyq):base(yyq,
2264 ((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value)) 2264 ((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value))
2265 .yytext){}} 2265 .yytext){}}
2266 2266
2267public class VoidArgEvent_6 : VoidArgEvent { 2267public class VoidArgEvent_6 : VoidArgEvent {
2268 public VoidArgEvent_6(Parser yyq):base(yyq, 2268 public VoidArgEvent_6(Parser yyq):base(yyq,
2269 ((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) 2269 ((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
2270 .yytext){}} 2270 .yytext){}}
2271 2271
2272public class VoidArgEvent_7 : VoidArgEvent { 2272public class VoidArgEvent_7 : VoidArgEvent {
2273 public VoidArgEvent_7(Parser yyq):base(yyq, 2273 public VoidArgEvent_7(Parser yyq):base(yyq,
2274 ((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) 2274 ((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
2275 .yytext){}} 2275 .yytext){}}
2276 2276
2277public class VoidArgEvent_8 : VoidArgEvent { 2277public class VoidArgEvent_8 : VoidArgEvent {
2278 public VoidArgEvent_8(Parser yyq):base(yyq, 2278 public VoidArgEvent_8(Parser yyq):base(yyq,
2279 ((TIMER_EVENT)(yyq.StackAt(0).m_value)) 2279 ((TIMER_EVENT)(yyq.StackAt(0).m_value))
2280 .yytext){}} 2280 .yytext){}}
2281 2281
2282public class KeyArgEvent_1 : KeyArgEvent { 2282public class KeyArgEvent_1 : KeyArgEvent {
2283 public KeyArgEvent_1(Parser yyq):base(yyq, 2283 public KeyArgEvent_1(Parser yyq):base(yyq,
2284 ((ATTACH_EVENT)(yyq.StackAt(0).m_value)) 2284 ((ATTACH_EVENT)(yyq.StackAt(0).m_value))
2285 .yytext){}} 2285 .yytext){}}
2286 2286
2287public class KeyArgEvent_2 : KeyArgEvent { 2287public class KeyArgEvent_2 : KeyArgEvent {
2288 public KeyArgEvent_2(Parser yyq):base(yyq, 2288 public KeyArgEvent_2(Parser yyq):base(yyq,
2289 ((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value)) 2289 ((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value))
2290 .yytext){}} 2290 .yytext){}}
2291 2291
2292public class IntArgEvent_1 : IntArgEvent { 2292public class IntArgEvent_1 : IntArgEvent {
2293 public IntArgEvent_1(Parser yyq):base(yyq, 2293 public IntArgEvent_1(Parser yyq):base(yyq,
2294 ((CHANGED_EVENT)(yyq.StackAt(0).m_value)) 2294 ((CHANGED_EVENT)(yyq.StackAt(0).m_value))
2295 .yytext){}} 2295 .yytext){}}
2296 2296
2297public class IntArgEvent_2 : IntArgEvent { 2297public class IntArgEvent_2 : IntArgEvent {
2298 public IntArgEvent_2(Parser yyq):base(yyq, 2298 public IntArgEvent_2(Parser yyq):base(yyq,
2299 ((COLLISION_EVENT)(yyq.StackAt(0).m_value)) 2299 ((COLLISION_EVENT)(yyq.StackAt(0).m_value))
2300 .yytext){}} 2300 .yytext){}}
2301 2301
2302public class IntArgEvent_3 : IntArgEvent { 2302public class IntArgEvent_3 : IntArgEvent {
2303 public IntArgEvent_3(Parser yyq):base(yyq, 2303 public IntArgEvent_3(Parser yyq):base(yyq,
2304 ((COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) 2304 ((COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
2305 .yytext){}} 2305 .yytext){}}
2306 2306
2307public class IntArgEvent_4 : IntArgEvent { 2307public class IntArgEvent_4 : IntArgEvent {
2308 public IntArgEvent_4(Parser yyq):base(yyq, 2308 public IntArgEvent_4(Parser yyq):base(yyq,
2309 ((COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) 2309 ((COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
2310 .yytext){}} 2310 .yytext){}}
2311 2311
2312public class IntArgEvent_5 : IntArgEvent { 2312public class IntArgEvent_5 : IntArgEvent {
2313 public IntArgEvent_5(Parser yyq):base(yyq, 2313 public IntArgEvent_5(Parser yyq):base(yyq,
2314 ((ON_REZ_EVENT)(yyq.StackAt(0).m_value)) 2314 ((ON_REZ_EVENT)(yyq.StackAt(0).m_value))
2315 .yytext){}} 2315 .yytext){}}
2316 2316
2317public class IntArgEvent_6 : IntArgEvent { 2317public class IntArgEvent_6 : IntArgEvent {
2318 public IntArgEvent_6(Parser yyq):base(yyq, 2318 public IntArgEvent_6(Parser yyq):base(yyq,
2319 ((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value)) 2319 ((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value))
2320 .yytext){}} 2320 .yytext){}}
2321 2321
2322public class IntArgEvent_7 : IntArgEvent { 2322public class IntArgEvent_7 : IntArgEvent {
2323 public IntArgEvent_7(Parser yyq):base(yyq, 2323 public IntArgEvent_7(Parser yyq):base(yyq,
2324 ((SENSOR_EVENT)(yyq.StackAt(0).m_value)) 2324 ((SENSOR_EVENT)(yyq.StackAt(0).m_value))
2325 .yytext){}} 2325 .yytext){}}
2326 2326
2327public class IntArgEvent_8 : IntArgEvent { 2327public class IntArgEvent_8 : IntArgEvent {
2328 public IntArgEvent_8(Parser yyq):base(yyq, 2328 public IntArgEvent_8(Parser yyq):base(yyq,
2329 ((TOUCH_EVENT)(yyq.StackAt(0).m_value)) 2329 ((TOUCH_EVENT)(yyq.StackAt(0).m_value))
2330 .yytext){}} 2330 .yytext){}}
2331 2331
2332public class IntArgEvent_9 : IntArgEvent { 2332public class IntArgEvent_9 : IntArgEvent {
2333 public IntArgEvent_9(Parser yyq):base(yyq, 2333 public IntArgEvent_9(Parser yyq):base(yyq,
2334 ((TOUCH_END_EVENT)(yyq.StackAt(0).m_value)) 2334 ((TOUCH_END_EVENT)(yyq.StackAt(0).m_value))
2335 .yytext){}} 2335 .yytext){}}
2336 2336
2337public class IntArgEvent_10 : IntArgEvent { 2337public class IntArgEvent_10 : IntArgEvent {
2338 public IntArgEvent_10(Parser yyq):base(yyq, 2338 public IntArgEvent_10(Parser yyq):base(yyq,
2339 ((TOUCH_START_EVENT)(yyq.StackAt(0).m_value)) 2339 ((TOUCH_START_EVENT)(yyq.StackAt(0).m_value))
2340 .yytext){}} 2340 .yytext){}}
2341 2341
2342public class VectorArgEvent_1 : VectorArgEvent { 2342public class VectorArgEvent_1 : VectorArgEvent {
2343 public VectorArgEvent_1(Parser yyq):base(yyq, 2343 public VectorArgEvent_1(Parser yyq):base(yyq,
2344 ((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value)) 2344 ((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value))
2345 .yytext){}} 2345 .yytext){}}
2346 2346
2347public class VectorArgEvent_2 : VectorArgEvent { 2347public class VectorArgEvent_2 : VectorArgEvent {
2348 public VectorArgEvent_2(Parser yyq):base(yyq, 2348 public VectorArgEvent_2(Parser yyq):base(yyq,
2349 ((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) 2349 ((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value))
2350 .yytext){}} 2350 .yytext){}}
2351 2351
2352public class VectorArgEvent_3 : VectorArgEvent { 2352public class VectorArgEvent_3 : VectorArgEvent {
2353 public VectorArgEvent_3(Parser yyq):base(yyq, 2353 public VectorArgEvent_3(Parser yyq):base(yyq,
2354 ((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) 2354 ((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value))
2355 .yytext){}} 2355 .yytext){}}
2356 2356
2357public class IntRotRotArgEvent_1 : IntRotRotArgEvent { 2357public class IntRotRotArgEvent_1 : IntRotRotArgEvent {
2358 public IntRotRotArgEvent_1(Parser yyq):base(yyq, 2358 public IntRotRotArgEvent_1(Parser yyq):base(yyq,
2359 ((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) 2359 ((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value))
2360 .yytext){}} 2360 .yytext){}}
2361 2361
2362public class IntVecVecArgEvent_1 : IntVecVecArgEvent { 2362public class IntVecVecArgEvent_1 : IntVecVecArgEvent {
2363 public IntVecVecArgEvent_1(Parser yyq):base(yyq, 2363 public IntVecVecArgEvent_1(Parser yyq):base(yyq,
2364 ((AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) 2364 ((AT_TARGET_EVENT)(yyq.StackAt(0).m_value))
2365 .yytext){}} 2365 .yytext){}}
2366 2366
2367public class KeyIntIntArgEvent_1 : KeyIntIntArgEvent { 2367public class KeyIntIntArgEvent_1 : KeyIntIntArgEvent {
2368 public KeyIntIntArgEvent_1(Parser yyq):base(yyq, 2368 public KeyIntIntArgEvent_1(Parser yyq):base(yyq,
2369 ((CONTROL_EVENT)(yyq.StackAt(0).m_value)) 2369 ((CONTROL_EVENT)(yyq.StackAt(0).m_value))
2370 .yytext){}} 2370 .yytext){}}
2371public class yyLSLSyntax 2371public class yyLSLSyntax
2372: YyParser { 2372: YyParser {
2373 public override object Action(Parser yyq,SYMBOL yysym, int yyact) { 2373 public override object Action(Parser yyq,SYMBOL yysym, int yyact) {
2374 switch(yyact) { 2374 switch(yyact) {
2375 case -1: break; //// keep compiler happy 2375 case -1: break; //// keep compiler happy
2376} return null; } 2376} return null; }
2377 2377
2378public class ArgumentDeclarationList_3 : ArgumentDeclarationList { 2378public class ArgumentDeclarationList_3 : ArgumentDeclarationList {
@@ -2390,7 +2390,7 @@ public class ArgumentDeclarationList_4 : ArgumentDeclarationList {
2390public class ArgumentDeclarationList_5 : ArgumentDeclarationList { 2390public class ArgumentDeclarationList_5 : ArgumentDeclarationList {
2391 public ArgumentDeclarationList_5(Parser yyq):base(yyq){}} 2391 public ArgumentDeclarationList_5(Parser yyq):base(yyq){}}
2392public yyLSLSyntax 2392public yyLSLSyntax
2393():base() { arr = new int[] { 2393():base() { arr = new int[] {
2394101,4,6,52,0, 2394101,4,6,52,0,
239546,0,53,0,102, 239546,0,53,0,102,
239620,103,4,28,76, 239620,103,4,28,76,
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 110fce6..7db6b6d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
48 } 48 }
49 49
50 protected EventAbortException( 50 protected EventAbortException(
51 SerializationInfo info, 51 SerializationInfo info,
52 StreamingContext context) 52 StreamingContext context)
53 { 53 {
54 } 54 }
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
62 } 62 }
63 63
64 protected SelfDeleteException( 64 protected SelfDeleteException(
65 SerializationInfo info, 65 SerializationInfo info,
66 StreamingContext context) 66 StreamingContext context)
67 { 67 {
68 } 68 }
@@ -76,14 +76,14 @@ namespace OpenSim.Region.ScriptEngine.Shared
76 } 76 }
77 77
78 protected ScriptDeleteException( 78 protected ScriptDeleteException(
79 SerializationInfo info, 79 SerializationInfo info,
80 StreamingContext context) 80 StreamingContext context)
81 { 81 {
82 } 82 }
83 } 83 }
84 84
85 /// <summary> 85 /// <summary>
86 /// Used to signal when the script is stopping in co-operation with the script engine 86 /// Used to signal when the script is stopping in co-operation with the script engine
87 /// (instead of through Thread.Abort()). 87 /// (instead of through Thread.Abort()).
88 /// </summary> 88 /// </summary>
89 [Serializable] 89 [Serializable]
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
94 } 94 }
95 95
96 protected ScriptCoopStopException( 96 protected ScriptCoopStopException(
97 SerializationInfo info, 97 SerializationInfo info,
98 StreamingContext context) 98 StreamingContext context)
99 { 99 {
100 } 100 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
index fdbdd8c..411d49c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Instance")] 8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared.Instance")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 7129c8a..9d72b1c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
88 88
89 // The following is for setting a minimum delay between events 89 // The following is for setting a minimum delay between events
90 private double m_minEventDelay; 90 private double m_minEventDelay;
91 91
92 private long m_eventDelayTicks; 92 private long m_eventDelayTicks;
93 private long m_nextEventTimeTicks; 93 private long m_nextEventTimeTicks;
94 private bool m_startOnInit = true; 94 private bool m_startOnInit = true;
@@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
122 { 122 {
123 if (value > 0.001) 123 if (value > 0.001)
124 m_minEventDelay = value; 124 m_minEventDelay = value;
125 else 125 else
126 m_minEventDelay = 0.0; 126 m_minEventDelay = 0.0;
127 127
128 m_eventDelayTicks = (long)(m_minEventDelay * 10000000L); 128 m_eventDelayTicks = (long)(m_minEventDelay * 10000000L);
@@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
154 { 154 {
155 bool wasSuspended = m_Suspended; 155 bool wasSuspended = m_Suspended;
156 m_Suspended = value; 156 m_Suspended = value;
157 157
158 if (wasSuspended && !m_Suspended) 158 if (wasSuspended && !m_Suspended)
159 { 159 {
160 lock (EventQueue) 160 lock (EventQueue)
@@ -201,11 +201,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
201 201
202 public long EventsQueued 202 public long EventsQueued
203 { 203 {
204 get 204 get
205 { 205 {
206 lock (EventQueue) 206 lock (EventQueue)
207 return EventQueue.Count; 207 return EventQueue.Count;
208 } 208 }
209 } 209 }
210 210
211 public long EventsProcessed { get; private set; } 211 public long EventsProcessed { get; private set; }
@@ -221,7 +221,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
221 private static readonly int MeasurementWindow = 30 * 1000; // show the *recent* time used by the script, to find currently active scripts 221 private static readonly int MeasurementWindow = 30 * 1000; // show the *recent* time used by the script, to find currently active scripts
222 222
223 private bool m_coopTermination; 223 private bool m_coopTermination;
224 224
225 private EventWaitHandle m_coopSleepHandle; 225 private EventWaitHandle m_coopSleepHandle;
226 226
227 public void ClearQueue() 227 public void ClearQueue()
@@ -281,7 +281,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
281 /// <param name='stateSource'></param> 281 /// <param name='stateSource'></param>
282 /// <returns>false if load failed, true if suceeded</returns> 282 /// <returns>false if load failed, true if suceeded</returns>
283 public bool Load( 283 public bool Load(
284 IScript script, EventWaitHandle coopSleepHandle, string assemblyPath, 284 IScript script, EventWaitHandle coopSleepHandle, string assemblyPath,
285 string dataPath, StateSource stateSource, bool coopTermination) 285 string dataPath, StateSource stateSource, bool coopTermination)
286 { 286 {
287 m_Script = script; 287 m_Script = script;
@@ -324,13 +324,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
324 return false; 324 return false;
325 } 325 }
326 326
327 // For attachments, XEngine saves the state into a .state file when XEngine.SetXMLState() is called. 327 // For attachments, XEngine saves the state into a .state file when XEngine.SetXMLState() is called.
328 string savedState = Path.Combine(m_dataPath, ItemID.ToString() + ".state"); 328 string savedState = Path.Combine(m_dataPath, ItemID.ToString() + ".state");
329 329
330 if (File.Exists(savedState)) 330 if (File.Exists(savedState))
331 { 331 {
332 // m_log.DebugFormat( 332 // m_log.DebugFormat(
333 // "[SCRIPT INSTANCE]: Found state for script {0} for {1} ({2}) at {3} in {4}", 333 // "[SCRIPT INSTANCE]: Found state for script {0} for {1} ({2}) at {3} in {4}",
334 // ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name); 334 // ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name);
335 335
336 string xml = String.Empty; 336 string xml = String.Empty;
@@ -395,7 +395,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
395 // else 395 // else
396 // { 396 // {
397 // m_log.DebugFormat( 397 // m_log.DebugFormat(
398 // "[SCRIPT INSTANCE]: Did not find state for script {0} for {1} ({2}) at {3} in {4}", 398 // "[SCRIPT INSTANCE]: Did not find state for script {0} for {1} ({2}) at {3} in {4}",
399 // ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name); 399 // ItemID, savedState, Part.Name, Part.ParentGroup.Name, Part.ParentGroup.Scene.Name);
400 // } 400 // }
401 401
@@ -407,11 +407,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
407 if (ShuttingDown) 407 if (ShuttingDown)
408 return; 408 return;
409 409
410 if (m_startedFromSavedState) 410 if (m_startedFromSavedState)
411 { 411 {
412 if (m_startOnInit) 412 if (m_startOnInit)
413 Start(); 413 Start();
414 if (m_postOnRez) 414 if (m_postOnRez)
415 { 415 {
416 PostEvent(new EventParams("on_rez", 416 PostEvent(new EventParams("on_rez",
417 new Object[] {new LSL_Types.LSLInteger(StartParam)}, new DetectParams[0])); 417 new Object[] {new LSL_Types.LSLInteger(StartParam)}, new DetectParams[0]));
@@ -439,13 +439,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
439 new Object[] { new LSL_Types.LSLInteger((int)Changed.TELEPORT) }, new DetectParams[0])); 439 new Object[] { new LSL_Types.LSLInteger((int)Changed.TELEPORT) }, new DetectParams[0]));
440 } 440 }
441 } 441 }
442 else 442 else
443 { 443 {
444 if (m_startOnInit) 444 if (m_startOnInit)
445 Start(); 445 Start();
446 PostEvent(new EventParams("state_entry", 446 PostEvent(new EventParams("state_entry",
447 new Object[0], new DetectParams[0])); 447 new Object[0], new DetectParams[0]));
448 if (m_postOnRez) 448 if (m_postOnRez)
449 { 449 {
450 PostEvent(new EventParams("on_rez", 450 PostEvent(new EventParams("on_rez",
451 new Object[] {new LSL_Types.LSLInteger(StartParam)}, new DetectParams[0])); 451 new Object[] {new LSL_Types.LSLInteger(StartParam)}, new DetectParams[0]));
@@ -462,7 +462,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
462 private void ReleaseControls() 462 private void ReleaseControls()
463 { 463 {
464 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); 464 SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
465 465
466 if (part != null) 466 if (part != null)
467 { 467 {
468 int permsMask; 468 int permsMask;
@@ -508,8 +508,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
508 { 508 {
509 m_log.Warn( 509 m_log.Warn(
510 string.Format( 510 string.Format(
511 "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}. Exception ", 511 "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}. Exception ",
512 savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name), 512 savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name),
513 e); 513 e);
514 } 514 }
515 } 515 }
@@ -631,7 +631,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
631 if (!m_InSelfDelete) 631 if (!m_InSelfDelete)
632 { 632 {
633 m_log.DebugFormat( 633 m_log.DebugFormat(
634 "[SCRIPT INSTANCE]: Aborting unstopped script {0} {1} in prim {2}, localID {3}, timeout was {4} ms", 634 "[SCRIPT INSTANCE]: Aborting unstopped script {0} {1} in prim {2}, localID {3}, timeout was {4} ms",
635 ScriptName, ItemID, PrimName, LocalID, timeout); 635 ScriptName, ItemID, PrimName, LocalID, timeout);
636 636
637 workItem.Abort(); 637 workItem.Abort();
@@ -709,7 +709,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
709 lock (EventQueue) 709 lock (EventQueue)
710 { 710 {
711 // The only events that persist across state changes are timers 711 // The only events that persist across state changes are timers
712 if (m_StateChangeInProgress && data.EventName != "timer") 712 if (m_StateChangeInProgress && data.EventName != "timer")
713 return; 713 return;
714 714
715 if (EventQueue.Count >= m_MaxScriptQueue) 715 if (EventQueue.Count >= m_MaxScriptQueue)
@@ -784,7 +784,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
784 return 0; 784 return 0;
785 785
786 ExecutionTimer.Restart(); 786 ExecutionTimer.Restart();
787 787
788 try 788 try
789 { 789 {
790 return EventProcessorInt(); 790 return EventProcessorInt();
@@ -927,7 +927,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
927 927
928 if(e.InnerException != null && e.InnerException is ScriptException) 928 if(e.InnerException != null && e.InnerException is ScriptException)
929 { 929 {
930 string text = e.InnerException.Message + 930 string text = e.InnerException.Message +
931 "(script: " + ScriptName + 931 "(script: " + ScriptName +
932 " event: " + data.EventName + 932 " event: " + data.EventName +
933 " at " + Part.AbsolutePosition + ")"; 933 " at " + Part.AbsolutePosition + ")";
@@ -945,10 +945,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
945 Part.UUID, 945 Part.UUID,
946 Part.AbsolutePosition, 946 Part.AbsolutePosition,
947 Part.ParentGroup.Scene.Name)); 947 Part.ParentGroup.Scene.Name));
948 948
949 } 949 }
950 else 950 else
951 { 951 {
952 952
953 // DISPLAY ERROR INWORLD 953 // DISPLAY ERROR INWORLD
954 string text = FormatException(e); 954 string text = FormatException(e);
@@ -1217,7 +1217,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
1217 1217
1218 return null; 1218 return null;
1219 } 1219 }
1220 1220
1221 public override string ToString() 1221 public override string ToString()
1222 { 1222 {
1223 return String.Format("{0} {1} on {2}", ScriptName, ItemID, PrimName); 1223 return String.Format("{0} {1} on {2}", ScriptName, ItemID, PrimName);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
index 5b9794b..8138117 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
79 m_xEngine.DebugLevel = 1; 79 m_xEngine.DebugLevel = 1;
80 80
81 IniConfigSource configSource = new IniConfigSource(); 81 IniConfigSource configSource = new IniConfigSource();
82 82
83 IConfig startupConfig = configSource.AddConfig("Startup"); 83 IConfig startupConfig = configSource.AddConfig("Startup");
84 startupConfig.Set("DefaultScriptEngine", "XEngine"); 84 startupConfig.Set("DefaultScriptEngine", "XEngine");
85 85
@@ -124,9 +124,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
124 TestHelpers.InMethod(); 124 TestHelpers.InMethod();
125// TestHelpers.EnableLogging(); 125// TestHelpers.EnableLogging();
126 126
127 string script = 127 string script =
128@"default 128@"default
129{ 129{
130 state_entry() 130 state_entry()
131 { 131 {
132 llSay(0, ""Thin Lizzy""); 132 llSay(0, ""Thin Lizzy"");
@@ -143,12 +143,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
143 TestHelpers.InMethod(); 143 TestHelpers.InMethod();
144// TestHelpers.EnableLogging(); 144// TestHelpers.EnableLogging();
145 145
146 string script = 146 string script =
147@"default 147@"default
148{ 148{
149 state_entry() 149 state_entry()
150 { 150 {
151 integer i = 0; 151 integer i = 0;
152 for (i = 0; i <= 1; i++) llSay(0, ""Iter "" + (string)i); 152 for (i = 0; i <= 1; i++) llSay(0, ""Iter "" + (string)i);
153 } 153 }
154}"; 154}";
@@ -162,14 +162,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
162 TestHelpers.InMethod(); 162 TestHelpers.InMethod();
163// TestHelpers.EnableLogging(); 163// TestHelpers.EnableLogging();
164 164
165 string script = 165 string script =
166@"default 166@"default
167{ 167{
168 state_entry() 168 state_entry()
169 { 169 {
170 integer i = 0; 170 integer i = 0;
171 llSay(0, ""Thin Lizzy""); 171 llSay(0, ""Thin Lizzy"");
172 172
173 for (i = 0; i < 2147483647; i++) llSay(0, ""Iter "" + (string)i); 173 for (i = 0; i < 2147483647; i++) llSay(0, ""Iter "" + (string)i);
174 } 174 }
175}"; 175}";
@@ -183,15 +183,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
183 TestHelpers.InMethod(); 183 TestHelpers.InMethod();
184// TestHelpers.EnableLogging(); 184// TestHelpers.EnableLogging();
185 185
186 string script = 186 string script =
187@"default 187@"default
188{ 188{
189 state_entry() 189 state_entry()
190 { 190 {
191 integer i = 0; 191 integer i = 0;
192 llSay(0, ""Thin Lizzy""); 192 llSay(0, ""Thin Lizzy"");
193 193
194 for (i = 0; i < 2147483647; i++) 194 for (i = 0; i < 2147483647; i++)
195 { 195 {
196 llSay(0, ""Iter "" + (string)i); 196 llSay(0, ""Iter "" + (string)i);
197 } 197 }
@@ -207,12 +207,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
207 TestHelpers.InMethod(); 207 TestHelpers.InMethod();
208// TestHelpers.EnableLogging(); 208// TestHelpers.EnableLogging();
209 209
210 string script = 210 string script =
211@"default 211@"default
212{ 212{
213 state_entry() 213 state_entry()
214 { 214 {
215 integer i = 0; 215 integer i = 0;
216 while (i < 2) llSay(0, ""Iter "" + (string)i++); 216 while (i < 2) llSay(0, ""Iter "" + (string)i++);
217 } 217 }
218}"; 218}";
@@ -226,15 +226,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
226 TestHelpers.InMethod(); 226 TestHelpers.InMethod();
227// TestHelpers.EnableLogging(); 227// TestHelpers.EnableLogging();
228 228
229 string script = 229 string script =
230@"default 230@"default
231{ 231{
232 state_entry() 232 state_entry()
233 { 233 {
234 integer i = 0; 234 integer i = 0;
235 llSay(0, ""Thin Lizzy""); 235 llSay(0, ""Thin Lizzy"");
236 236
237 while (1 == 1) 237 while (1 == 1)
238 llSay(0, ""Iter "" + (string)i++); 238 llSay(0, ""Iter "" + (string)i++);
239 } 239 }
240}"; 240}";
@@ -248,15 +248,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
248 TestHelpers.InMethod(); 248 TestHelpers.InMethod();
249// TestHelpers.EnableLogging(); 249// TestHelpers.EnableLogging();
250 250
251 string script = 251 string script =
252@"default 252@"default
253{ 253{
254 state_entry() 254 state_entry()
255 { 255 {
256 integer i = 0; 256 integer i = 0;
257 llSay(0, ""Thin Lizzy""); 257 llSay(0, ""Thin Lizzy"");
258 258
259 while (1 == 1) 259 while (1 == 1)
260 { 260 {
261 llSay(0, ""Iter "" + (string)i++); 261 llSay(0, ""Iter "" + (string)i++);
262 } 262 }
@@ -272,9 +272,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
272 TestHelpers.InMethod(); 272 TestHelpers.InMethod();
273// TestHelpers.EnableLogging(); 273// TestHelpers.EnableLogging();
274 274
275 string script = 275 string script =
276@"default 276@"default
277{ 277{
278 state_entry() 278 state_entry()
279 { 279 {
280 integer i = 0; 280 integer i = 0;
@@ -293,9 +293,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
293 TestHelpers.InMethod(); 293 TestHelpers.InMethod();
294// TestHelpers.EnableLogging(); 294// TestHelpers.EnableLogging();
295 295
296 string script = 296 string script =
297@"default 297@"default
298{ 298{
299 state_entry() 299 state_entry()
300 { 300 {
301 integer i = 0; 301 integer i = 0;
@@ -315,15 +315,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
315 TestHelpers.InMethod(); 315 TestHelpers.InMethod();
316// TestHelpers.EnableLogging(); 316// TestHelpers.EnableLogging();
317 317
318 string script = 318 string script =
319@"default 319@"default
320{ 320{
321 state_entry() 321 state_entry()
322 { 322 {
323 integer i = 0; 323 integer i = 0;
324 llSay(0, ""Thin Lizzy""); 324 llSay(0, ""Thin Lizzy"");
325 325
326 do 326 do
327 { 327 {
328 llSay(0, ""Iter "" + (string)i++); 328 llSay(0, ""Iter "" + (string)i++);
329 } while (1 == 1); 329 } while (1 == 1);
@@ -339,15 +339,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
339 TestHelpers.InMethod(); 339 TestHelpers.InMethod();
340 TestHelpers.EnableLogging(); 340 TestHelpers.EnableLogging();
341 341
342 string script = 342 string script =
343@"default 343@"default
344{ 344{
345 state_entry() 345 state_entry()
346 { 346 {
347 integer i = 0; 347 integer i = 0;
348 llSay(0, ""Thin Lizzy""); 348 llSay(0, ""Thin Lizzy"");
349 349
350 @p1; 350 @p1;
351 llSay(0, ""Iter "" + (string)i++); 351 llSay(0, ""Iter "" + (string)i++);
352 jump p1; 352 jump p1;
353 } 353 }
@@ -364,7 +364,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance.Tests
364 TestHelpers.InMethod(); 364 TestHelpers.InMethod();
365// TestHelpers.EnableLogging(); 365// TestHelpers.EnableLogging();
366 366
367 string script = 367 string script =
368@" 368@"
369integer i = 0; 369integer i = 0;
370 370
@@ -375,7 +375,7 @@ ufn1()
375} 375}
376 376
377default 377default
378{ 378{
379 state_entry() 379 state_entry()
380 { 380 {
381 integer i = 0; 381 integer i = 0;
@@ -396,9 +396,9 @@ default
396 TestHelpers.InMethod(); 396 TestHelpers.InMethod();
397// TestHelpers.EnableLogging(); 397// TestHelpers.EnableLogging();
398 398
399 string script = 399 string script =
400@"default 400@"default
401{ 401{
402 state_entry() 402 state_entry()
403 { 403 {
404 integer i = 0; 404 integer i = 0;
@@ -417,7 +417,7 @@ default
417// UUID objectId = TestHelpers.ParseTail(0x100); 417// UUID objectId = TestHelpers.ParseTail(0x100);
418// UUID itemId = TestHelpers.ParseTail(0x3); 418// UUID itemId = TestHelpers.ParseTail(0x3);
419 419
420 SceneObjectGroup so 420 SceneObjectGroup so
421 = SceneHelpers.CreateSceneObject(1, userId, string.Format("Object for {0}", itemName), 0x100); 421 = SceneHelpers.CreateSceneObject(1, userId, string.Format("Object for {0}", itemName), 0x100);
422 m_scene.AddNewSceneObject(so, true); 422 m_scene.AddNewSceneObject(so, true);
423 423
@@ -505,7 +505,7 @@ default
505 505
506 if (++m_chatMessagesReceived >= m_chatMessagesThreshold) 506 if (++m_chatMessagesReceived >= m_chatMessagesThreshold)
507 { 507 {
508 m_scene.EventManager.OnChatFromWorld -= OnChatFromWorld; 508 m_scene.EventManager.OnChatFromWorld -= OnChatFromWorld;
509 m_chatEvent.Set(); 509 m_chatEvent.Set();
510 } 510 }
511 } 511 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 738a814..f16fd01 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1495,7 +1495,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1495 return false; 1495 return false;
1496 } 1496 }
1497 } 1497 }
1498 1498
1499 public static bool operator true(key k) 1499 public static bool operator true(key k)
1500 { 1500 {
1501 return (Boolean)k; 1501 return (Boolean)k;
@@ -1575,7 +1575,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1575 string s = String.Format(Culture.FormatProvider, "{0:0.000000}", f.value); 1575 string s = String.Format(Culture.FormatProvider, "{0:0.000000}", f.value);
1576 m_string = s; 1576 m_string = s;
1577 } 1577 }
1578 1578
1579 public LSLString(int i) 1579 public LSLString(int i)
1580 { 1580 {
1581 string s = String.Format("{0}", i); 1581 string s = String.Format("{0}", i);
@@ -1583,7 +1583,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1583 } 1583 }
1584 1584
1585 public LSLString(LSLInteger i) : this(i.value) {} 1585 public LSLString(LSLInteger i) : this(i.value) {}
1586 1586
1587 #endregion 1587 #endregion
1588 1588
1589 #region Operators 1589 #region Operators
@@ -1648,7 +1648,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1648 { 1648 {
1649 return new LSLString(d); 1649 return new LSLString(d);
1650 } 1650 }
1651 1651
1652 static public explicit operator LSLString(int i) 1652 static public explicit operator LSLString(int i)
1653 { 1653 {
1654 return new LSLString(i); 1654 return new LSLString(i);
@@ -1936,7 +1936,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
1936 return false; 1936 return false;
1937 } 1937 }
1938 } 1938 }
1939 1939
1940 return value == ((LSLInteger)o).value; 1940 return value == ((LSLInteger)o).value;
1941 } 1941 }
1942 1942
diff --git a/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs
index d08b0a6..a5362a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared")] 8[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.Shared")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
index 30dc4cd..4dc8fc6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
112 public void TearDown() 112 public void TearDown()
113 { 113 {
114 MainServer.Instance.Stop(); 114 MainServer.Instance.Stop();
115 } 115 }
116 116
117 [Test] 117 [Test]
118 public void TestLlReleaseUrl() 118 public void TestLlReleaseUrl()
@@ -204,8 +204,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
204 // Check that request to URL works. 204 // Check that request to URL works.
205 string testResponse = "Hello World"; 205 string testResponse = "Hello World";
206 206
207 m_engine.ClearPostedEvents(); 207 m_engine.ClearPostedEvents();
208 m_engine.PostEventHook 208 m_engine.PostEventHook
209 += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse); 209 += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse);
210 210
211// Console.WriteLine("Trying {0}", returnedUri); 211// Console.WriteLine("Trying {0}", returnedUri);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
index 9b7cab2..d652b0d1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
160 // Item has copy permissions so original should stay intact. 160 // Item has copy permissions so original should stay intact.
161 List<TaskInventoryItem> originalItems = so1.RootPart.Inventory.GetInventoryItems(); 161 List<TaskInventoryItem> originalItems = so1.RootPart.Inventory.GetInventoryItems();
162 Assert.That(originalItems.Count, Is.EqualTo(1)); 162 Assert.That(originalItems.Count, Is.EqualTo(1));
163 163
164 // Should now have copied. 164 // Should now have copied.
165 List<TaskInventoryItem> copiedItems = so2.RootPart.Inventory.GetInventoryItems(inventoryItemName); 165 List<TaskInventoryItem> copiedItems = so2.RootPart.Inventory.GetInventoryItems(inventoryItemName);
166 Assert.That(copiedItems.Count, Is.EqualTo(1)); 166 Assert.That(copiedItems.Count, Is.EqualTo(1));
@@ -194,7 +194,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
194 194
195 api.llGiveInventory(user2Id.ToString(), inventoryItemName); 195 api.llGiveInventory(user2Id.ToString(), inventoryItemName);
196 196
197 InventoryItemBase receivedItem 197 InventoryItemBase receivedItem
198 = UserInventoryHelpers.GetInventoryItem( 198 = UserInventoryHelpers.GetInventoryItem(
199 m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName)); 199 m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName));
200 200
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
222 222
223 // Create an object embedded inside the first 223 // Create an object embedded inside the first
224 UUID itemId = TestHelpers.ParseTail(0x20); 224 UUID itemId = TestHelpers.ParseTail(0x20);
225 TaskInventoryItem tii 225 TaskInventoryItem tii
226 = TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, user1Id); 226 = TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, user1Id);
227 tii.NextPermissions &= ~((uint)PermissionMask.Modify); 227 tii.NextPermissions &= ~((uint)PermissionMask.Modify);
228 228
@@ -230,7 +230,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
230 230
231 api.llGiveInventory(user2Id.ToString(), inventoryItemName); 231 api.llGiveInventory(user2Id.ToString(), inventoryItemName);
232 232
233 InventoryItemBase receivedItem 233 InventoryItemBase receivedItem
234 = UserInventoryHelpers.GetInventoryItem( 234 = UserInventoryHelpers.GetInventoryItem(
235 m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName)); 235 m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName));
236 236
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
index 14b1890..435a95f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
127 TaskInventoryItem grp1Item 127 TaskInventoryItem grp1Item
128 = TaskInventoryHelpers.AddNotecard( 128 = TaskInventoryHelpers.AddNotecard(
129 m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); 129 m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
130 130
131 grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 131 grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
132 132
133 LSL_Api apiGrp1 = new LSL_Api(); 133 LSL_Api apiGrp1 = new LSL_Api();
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
156 TaskInventoryItem grp1Item 156 TaskInventoryItem grp1Item
157 = TaskInventoryHelpers.AddNotecard( 157 = TaskInventoryHelpers.AddNotecard(
158 m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); 158 m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
159 159
160 grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 160 grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
161 161
162 LSL_Api apiGrp1 = new LSL_Api(); 162 LSL_Api apiGrp1 = new LSL_Api();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
index 34a29e6..f978138 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.ScriptEngine.Shared.Api;
37using OpenSim.Region.ScriptEngine.Shared.Instance; 37using OpenSim.Region.ScriptEngine.Shared.Instance;
38using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 38using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
39using OpenMetaverse; 39using OpenMetaverse;
40 40
41using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; 41using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
42using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; 42using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
43using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; 43using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
@@ -69,7 +69,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
69 m_lslApi = new LSL_Api(); 69 m_lslApi = new LSL_Api();
70 m_lslApi.Initialize(engine, part, null); 70 m_lslApi.Initialize(engine, part, null);
71 } 71 }
72 72
73 [Test] 73 [Test]
74 public void TestllListFindList() 74 public void TestllListFindList()
75 { 75 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
index 9ab3115..a341311 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
76 76
77 string[] ncLines = { "One", "Twoè", "Three" }; 77 string[] ncLines = { "One", "Twoè", "Three" };
78 78
79 TaskInventoryItem ncItem 79 TaskInventoryItem ncItem
80 = TaskInventoryHelpers.AddNotecard(m_scene.AssetService, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines)); 80 = TaskInventoryHelpers.AddNotecard(m_scene.AssetService, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines));
81 81
82 AssertValidNotecardLine(ncItem.Name, 0, ncLines[0]); 82 AssertValidNotecardLine(ncItem.Name, 0, ncLines[0]);
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
111 { 111 {
112 string key = m_lslApi.llGetNotecardLine(ncName, lineNumber); 112 string key = m_lslApi.llGetNotecardLine(ncName, lineNumber);
113 Assert.That(key, Is.Not.EqualTo(UUID.Zero.ToString())); 113 Assert.That(key, Is.Not.EqualTo(UUID.Zero.ToString()));
114 114
115 Assert.That(m_engine.PostedEvents.Count, Is.EqualTo(1)); 115 Assert.That(m_engine.PostedEvents.Count, Is.EqualTo(1));
116 Assert.That(m_engine.PostedEvents.ContainsKey(m_scriptItem.ItemID)); 116 Assert.That(m_engine.PostedEvents.ContainsKey(m_scriptItem.ItemID));
117 117
@@ -223,8 +223,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
223// // Check that request to URL works. 223// // Check that request to URL works.
224// string testResponse = "Hello World"; 224// string testResponse = "Hello World";
225// 225//
226// m_engine.ClearPostedEvents(); 226// m_engine.ClearPostedEvents();
227// m_engine.PostEventHook 227// m_engine.PostEventHook
228// += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse); 228// += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse);
229// 229//
230//// Console.WriteLine("Trying {0}", returnedUri); 230//// Console.WriteLine("Trying {0}", returnedUri);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
index d957bf2..b994901 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
93 93
94 // Check simple 1 prim case 94 // Check simple 1 prim case
95 { 95 {
96 LSL_List resList 96 LSL_List resList
97 = apiGrp1.llGetLinkPrimitiveParams(1, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 97 = apiGrp1.llGetLinkPrimitiveParams(1, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
98 98
99 Assert.That(resList.Length, Is.EqualTo(1)); 99 Assert.That(resList.Length, Is.EqualTo(1));
@@ -101,11 +101,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
101 101
102 // Check 2 prim case 102 // Check 2 prim case
103 { 103 {
104 LSL_List resList 104 LSL_List resList
105 = apiGrp1.llGetLinkPrimitiveParams( 105 = apiGrp1.llGetLinkPrimitiveParams(
106 1, 106 1,
107 new LSL_List( 107 new LSL_List(
108 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 108 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION),
109 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET), 109 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
110 new LSL_Integer(2), 110 new LSL_Integer(2),
111 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 111 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
115 115
116 // Check invalid parameters are ignored 116 // Check invalid parameters are ignored
117 { 117 {
118 LSL_List resList 118 LSL_List resList
119 = apiGrp1.llGetLinkPrimitiveParams(3, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 119 = apiGrp1.llGetLinkPrimitiveParams(3, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
120 120
121 Assert.That(resList.Length, Is.EqualTo(0)); 121 Assert.That(resList.Length, Is.EqualTo(0));
@@ -123,11 +123,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
123 123
124 // Check all parameters are ignored if an initial bad link is given 124 // Check all parameters are ignored if an initial bad link is given
125 { 125 {
126 LSL_List resList 126 LSL_List resList
127 = apiGrp1.llGetLinkPrimitiveParams( 127 = apiGrp1.llGetLinkPrimitiveParams(
128 3, 128 3,
129 new LSL_List( 129 new LSL_List(
130 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 130 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION),
131 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET), 131 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
132 new LSL_Integer(1), 132 new LSL_Integer(1),
133 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 133 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
@@ -137,11 +137,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
137 137
138 // Check only subsequent parameters are ignored when we hit the first bad link number 138 // Check only subsequent parameters are ignored when we hit the first bad link number
139 { 139 {
140 LSL_List resList 140 LSL_List resList
141 = apiGrp1.llGetLinkPrimitiveParams( 141 = apiGrp1.llGetLinkPrimitiveParams(
142 1, 142 1,
143 new LSL_List( 143 new LSL_List(
144 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 144 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION),
145 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET), 145 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
146 new LSL_Integer(3), 146 new LSL_Integer(3),
147 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 147 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
197 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut 197 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut
198 0.90f, // Prim hollow 198 0.90f, // Prim hollow
199 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim twist 199 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim twist
200 new LSL_Types.Vector3(2.0d, 1.0d, 0.0d), // Prim taper 200 new LSL_Types.Vector3(2.0d, 1.0d, 0.0d), // Prim taper
201 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 201 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear
202 0.90f); // Prim hollow check 202 0.90f); // Prim hollow check
203 203
@@ -211,7 +211,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
211 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut 211 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut
212 0.99f, // Prim hollow 212 0.99f, // Prim hollow
213 new LSL_Types.Vector3(1.0d, 0.0d, 0.0d), // Prim twist 213 new LSL_Types.Vector3(1.0d, 0.0d, 0.0d), // Prim twist
214 new LSL_Types.Vector3(1.0d, 1.0d, 0.0d), // Prim taper 214 new LSL_Types.Vector3(1.0d, 1.0d, 0.0d), // Prim taper
215 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 215 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear
216 0.99f); // Prim hollow check 216 0.99f); // Prim hollow check
217 217
@@ -252,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
252 new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d), // Prim twist 252 new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d), // Prim twist
253 // Expression for y selected to test precision problems during sbyte 253 // Expression for y selected to test precision problems during sbyte
254 // cast in SetPrimitiveShapeParams. 254 // cast in SetPrimitiveShapeParams.
255 new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d), // Prim taper 255 new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d), // Prim taper
256 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 256 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear
257 0.70f); // Prim hollow check 257 0.70f); // Prim hollow check
258 258
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index d929da8..98800d0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -88,19 +88,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
88 CheckllAngleBetween(new Vector3(1, 1, 1), 0, 1, 1); 88 CheckllAngleBetween(new Vector3(1, 1, 1), 0, 1, 1);
89 CheckllAngleBetween(new Vector3(1, 1, 1), 90, 1, 1); 89 CheckllAngleBetween(new Vector3(1, 1, 1), 90, 1, 1);
90 CheckllAngleBetween(new Vector3(1, 1, 1), 180, 1, 1); 90 CheckllAngleBetween(new Vector3(1, 1, 1), 180, 1, 1);
91 91
92 CheckllAngleBetween(new Vector3(1, 0, 0), 0, 1.6f, 1.8f); 92 CheckllAngleBetween(new Vector3(1, 0, 0), 0, 1.6f, 1.8f);
93 CheckllAngleBetween(new Vector3(1, 0, 0), 90, 0.3f, 3.9f); 93 CheckllAngleBetween(new Vector3(1, 0, 0), 90, 0.3f, 3.9f);
94 CheckllAngleBetween(new Vector3(1, 0, 0), 180, 8.8f, 7.4f); 94 CheckllAngleBetween(new Vector3(1, 0, 0), 180, 8.8f, 7.4f);
95 95
96 CheckllAngleBetween(new Vector3(0, 1, 0), 0, 9.8f, -9.4f); 96 CheckllAngleBetween(new Vector3(0, 1, 0), 0, 9.8f, -9.4f);
97 CheckllAngleBetween(new Vector3(0, 1, 0), 90, 8.4f, -8.2f); 97 CheckllAngleBetween(new Vector3(0, 1, 0), 90, 8.4f, -8.2f);
98 CheckllAngleBetween(new Vector3(0, 1, 0), 180, 0.4f, -5.8f); 98 CheckllAngleBetween(new Vector3(0, 1, 0), 180, 0.4f, -5.8f);
99 99
100 CheckllAngleBetween(new Vector3(0, 0, 1), 0, -6.8f, 3.4f); 100 CheckllAngleBetween(new Vector3(0, 0, 1), 0, -6.8f, 3.4f);
101 CheckllAngleBetween(new Vector3(0, 0, 1), 90, -3.6f, 5.6f); 101 CheckllAngleBetween(new Vector3(0, 0, 1), 90, -3.6f, 5.6f);
102 CheckllAngleBetween(new Vector3(0, 0, 1), 180, -3.8f, 1.1f); 102 CheckllAngleBetween(new Vector3(0, 0, 1), 180, -3.8f, 1.1f);
103 103
104 CheckllAngleBetween(new Vector3(1, 1, 1), 0, -7.7f, -2.0f); 104 CheckllAngleBetween(new Vector3(1, 1, 1), 0, -7.7f, -2.0f);
105 CheckllAngleBetween(new Vector3(1, 1, 1), 90, -3.0f, -9.1f); 105 CheckllAngleBetween(new Vector3(1, 1, 1), 90, -3.0f, -9.1f);
106 CheckllAngleBetween(new Vector3(1, 1, 1), 180, -7.9f, -8.0f); 106 CheckllAngleBetween(new Vector3(1, 1, 1), 180, -7.9f, -8.0f);
@@ -246,7 +246,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
246 LSL_Types.Quaternion newRot = m_lslApi.llEuler2Rot(eulerCalc); 246 LSL_Types.Quaternion newRot = m_lslApi.llEuler2Rot(eulerCalc);
247 // Multiple original quaternion by conjugate of quaternion calculated with angles. 247 // Multiple original quaternion by conjugate of quaternion calculated with angles.
248 LSL_Types.Quaternion check = rot * new LSL_Types.Quaternion(-newRot.x, -newRot.y, -newRot.z, newRot.s); 248 LSL_Types.Quaternion check = rot * new LSL_Types.Quaternion(-newRot.x, -newRot.y, -newRot.z, newRot.s);
249 249
250 Assert.AreEqual(0.0, check.x, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler X bounds check fail"); 250 Assert.AreEqual(0.0, check.x, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler X bounds check fail");
251 Assert.AreEqual(0.0, check.y, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Y bounds check fail"); 251 Assert.AreEqual(0.0, check.y, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Y bounds check fail");
252 Assert.AreEqual(0.0, check.z, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Z bounds check fail"); 252 Assert.AreEqual(0.0, check.z, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Z bounds check fail");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
index c8c7f82..b2396fa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
155 m_stringDoubleSet.Add("1ef", 1.0); 155 m_stringDoubleSet.Add("1ef", 1.0);
156 m_stringDoubleSet.Add("e10", 0.0); 156 m_stringDoubleSet.Add("e10", 0.0);
157 m_stringDoubleSet.Add("1.e0.0", 1.0); 157 m_stringDoubleSet.Add("1.e0.0", 1.0);
158 158
159 m_doubleStringSet = new Dictionary<double, string>(); 159 m_doubleStringSet = new Dictionary<double, string>();
160 m_doubleStringSet.Add(2.0, "2.000000"); 160 m_doubleStringSet.Add(2.0, "2.000000");
161 m_doubleStringSet.Add(-2.0, "-2.000000"); 161 m_doubleStringSet.Add(-2.0, "-2.000000");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
index c664108..2bd684f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
131 public void TestImplicitCastBooleanToLSLInteger() 131 public void TestImplicitCastBooleanToLSLInteger()
132 { 132 {
133 TestHelpers.InMethod(); 133 TestHelpers.InMethod();
134 134
135 LSL_Types.LSLInteger testInteger; 135 LSL_Types.LSLInteger testInteger;
136 136
137 testInteger = (1 == 0); 137 testInteger = (1 == 0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
index 8550f2d..0159b9e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
125 public void TestImplicitCastBooleanToLSLFloat() 125 public void TestImplicitCastBooleanToLSLFloat()
126 { 126 {
127 TestHelpers.InMethod(); 127 TestHelpers.InMethod();
128 128
129 LSL_Types.LSLString testString; 129 LSL_Types.LSLString testString;
130 130
131 testString = (LSL_Types.LSLString) (1 == 0); 131 testString = (LSL_Types.LSLString) (1 == 0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 99bff83..6936191 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -296,7 +296,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
296 string npcRaw 296 string npcRaw
297 = osslApi.osNpcCreate( 297 = osslApi.osNpcCreate(
298 "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_CREATOR_OWNED); 298 "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_CREATOR_OWNED);
299 299
300 otherOsslApi.osNpcRemove(npcRaw); 300 otherOsslApi.osNpcRemove(npcRaw);
301 301
302 // Should still be around 302 // Should still be around
@@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
340 string npcRaw 340 string npcRaw
341 = osslApi.osNpcCreate( 341 = osslApi.osNpcCreate(
342 "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_NOT_OWNED); 342 "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_NOT_OWNED);
343 343
344 osslApi.osNpcRemove(npcRaw); 344 osslApi.osNpcRemove(npcRaw);
345 345
346 UUID npcId = new UUID(npcRaw); 346 UUID npcId = new UUID(npcRaw);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs b/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs
index f4211c8..80d9e2a 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Api/Runtime/XEngineScriptBase.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.ScriptBase
44 /// <summary> 44 /// <summary>
45 /// Used for script sleeps when we are using co-operative script termination. 45 /// Used for script sleeps when we are using co-operative script termination.
46 /// </summary> 46 /// </summary>
47 /// <remarks>null if co-operative script termination is not active</remarks> 47 /// <remarks>null if co-operative script termination is not active</remarks>
48 WaitHandle m_coopSleepHandle; 48 WaitHandle m_coopSleepHandle;
49 49
50 public XEngineScriptBase(WaitHandle coopSleepHandle) : base() 50 public XEngineScriptBase(WaitHandle coopSleepHandle) : base()
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 301eada..55a77bc 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
79 } 79 }
80 80
81 /// <summary> 81 /// <summary>
82 /// When an object gets paid by an avatar and generates the paid event, 82 /// When an object gets paid by an avatar and generates the paid event,
83 /// this will pipe it to the script engine 83 /// this will pipe it to the script engine
84 /// </summary> 84 /// </summary>
85 /// <param name="objectID">Object ID that got paid</param> 85 /// <param name="objectID">Object ID that got paid</param>
@@ -413,7 +413,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
413 return; 413 return;
414 414
415 foreach(SceneObjectPart part in grp.Parts) 415 foreach(SceneObjectPart part in grp.Parts)
416 { 416 {
417 myScriptEngine.PostObjectEvent(part.LocalId, new EventParams( 417 myScriptEngine.PostObjectEvent(part.LocalId, new EventParams(
418 "attach",new object[] { 418 "attach",new object[] {
419 new LSL_Types.LSLString(avatar.ToString()) }, 419 new LSL_Types.LSLString(avatar.ToString()) },
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
index a2b030d..b3fedcb 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4using Mono.Addins; 4using Mono.Addins;
5 5
6// General Information about an assembly is controlled through the following 6// General Information about an assembly is controlled through the following
7// set of attributes. Change these attribute values to modify the information 7// set of attributes. Change these attribute values to modify the information
8// associated with an assembly. 8// associated with an assembly.
9[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.XEngine")] 9[assembly: AssemblyTitle("OpenSim.Region.ScriptEngine.XEngine")]
@@ -15,8 +15,8 @@ using Mono.Addins;
15[assembly: AssemblyTrademark("")] 15[assembly: AssemblyTrademark("")]
16[assembly: AssemblyCulture("")] 16[assembly: AssemblyCulture("")]
17 17
18// Setting ComVisible to false makes the types in this assembly not visible 18// Setting ComVisible to false makes the types in this assembly not visible
19// to COM components. If you need to access a type in this assembly from 19// to COM components. If you need to access a type in this assembly from
20// COM, set the ComVisible attribute to true on that type. 20// COM, set the ComVisible attribute to true on that type.
21[assembly: ComVisible(false)] 21[assembly: ComVisible(false)]
22 22
@@ -26,7 +26,7 @@ using Mono.Addins;
26// Version information for an assembly consists of the following four values: 26// Version information for an assembly consists of the following four values:
27// 27//
28// Major Version 28// Major Version
29// Minor Version 29// Minor Version
30// Build Number 30// Build Number
31// Revision 31// Revision
32// 32//
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
index 878e571..71ef0ac 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineBasicTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
58 m_xEngine = new XEngine(); 58 m_xEngine = new XEngine();
59 59
60 IniConfigSource configSource = new IniConfigSource(); 60 IniConfigSource configSource = new IniConfigSource();
61 61
62 IConfig startupConfig = configSource.AddConfig("Startup"); 62 IConfig startupConfig = configSource.AddConfig("Startup");
63 startupConfig.Set("DefaultScriptEngine", "XEngine"); 63 startupConfig.Set("DefaultScriptEngine", "XEngine");
64 64
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
index c977285..477059f 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineCrossingTests.cs
@@ -126,11 +126,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests
126 OSChatMessage messageReceived = null; 126 OSChatMessage messageReceived = null;
127 sceneA.EventManager.OnChatFromWorld += (s, m) => { messageReceived = m; chatEvent.Set(); }; 127 sceneA.EventManager.OnChatFromWorld += (s, m) => { messageReceived = m; chatEvent.Set(); };
128 128
129 sceneA.RezNewScript(userId, scriptItemSceneA, 129 sceneA.RezNewScript(userId, scriptItemSceneA,
130@"integer c = 0; 130@"integer c = 0;
131 131
132default 132default
133{ 133{
134 state_entry() 134 state_entry()
135 { 135 {
136 llSay(0, ""Script running""); 136 llSay(0, ""Script running"");
@@ -143,7 +143,7 @@ default
143 143
144 touch_start(integer n) 144 touch_start(integer n)
145 { 145 {
146 c = c + 1; 146 c = c + 1;
147 llSay(0, (string)c); 147 llSay(0, (string)c);
148 } 148 }
149}"); 149}");
@@ -151,7 +151,7 @@ default
151 chatEvent.WaitOne(60000); 151 chatEvent.WaitOne(60000);
152 152
153 Assert.That(messageReceived, Is.Not.Null, "No chat message received."); 153 Assert.That(messageReceived, Is.Not.Null, "No chat message received.");
154 Assert.That(messageReceived.Message, Is.EqualTo("Script running")); 154 Assert.That(messageReceived.Message, Is.EqualTo("Script running"));
155 155
156 { 156 {
157 // XXX: Should not be doing this so directly. Should call some variant of EventManager.touch() instead. 157 // XXX: Should not be doing this so directly. Should call some variant of EventManager.touch() instead.
@@ -167,7 +167,7 @@ default
167 xEngineA.PostObjectEvent(soSceneA.LocalId, ep); 167 xEngineA.PostObjectEvent(soSceneA.LocalId, ep);
168 chatEvent.WaitOne(60000); 168 chatEvent.WaitOne(60000);
169 169
170 Assert.That(messageReceived.Message, Is.EqualTo("1")); 170 Assert.That(messageReceived.Message, Is.EqualTo("1"));
171 } 171 }
172 172
173 AutoResetEvent chatEventB = new AutoResetEvent(false); 173 AutoResetEvent chatEventB = new AutoResetEvent(false);
@@ -181,7 +181,7 @@ default
181 chatEventB.WaitOne(60000); 181 chatEventB.WaitOne(60000);
182 Assert.That(messageReceived, Is.Not.Null, "No Changed message received."); 182 Assert.That(messageReceived, Is.Not.Null, "No Changed message received.");
183 Assert.That(messageReceived.Message, Is.Not.Null, "Changed message without content"); 183 Assert.That(messageReceived.Message, Is.Not.Null, "Changed message without content");
184 Assert.That(messageReceived.Message, Is.EqualTo("Changed")); 184 Assert.That(messageReceived.Message, Is.EqualTo("Changed"));
185 185
186 // TEST sending event to moved prim and output 186 // TEST sending event to moved prim and output
187 { 187 {
@@ -202,7 +202,7 @@ default
202 xEngineB.PostObjectEvent(soSceneB.LocalId, ep); 202 xEngineB.PostObjectEvent(soSceneB.LocalId, ep);
203 chatEventB.WaitOne(60000); 203 chatEventB.WaitOne(60000);
204 204
205 Assert.That(messageReceived.Message, Is.EqualTo("2")); 205 Assert.That(messageReceived.Message, Is.EqualTo("2"));
206 } 206 }
207 } 207 }
208 } 208 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 7822df9..cd5308d 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -131,9 +131,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
131 /// It appears that if a script thread is aborted whilst it is holding ReaderWriterLockSlim (possibly the write 131 /// It appears that if a script thread is aborted whilst it is holding ReaderWriterLockSlim (possibly the write
132 /// lock) then the lock is not properly released. This causes mono 2.6, 2.10 and possibly 132 /// lock) then the lock is not properly released. This causes mono 2.6, 2.10 and possibly
133 /// later to crash, sometimes with symptoms such as a leap to 100% script usage and a vm thead dump showing 133 /// later to crash, sometimes with symptoms such as a leap to 100% script usage and a vm thead dump showing
134 /// all threads waiting on release of ReaderWriterLockSlim write thread which none of the threads listed 134 /// all threads waiting on release of ReaderWriterLockSlim write thread which none of the threads listed
135 /// actually hold. 135 /// actually hold.
136 /// 136 ///
137 /// Pausing for event completion reduces the risk of this happening. However, it may be that aborting threads 137 /// Pausing for event completion reduces the risk of this happening. However, it may be that aborting threads
138 /// is not a mono issue per se but rather a risky activity in itself in an AppDomain that is not immediately 138 /// is not a mono issue per se but rather a risky activity in itself in an AppDomain that is not immediately
139 /// shutting down. 139 /// shutting down.
@@ -307,7 +307,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
307 m_EventLimit = m_ScriptConfig.GetInt("EventLimit", 30); 307 m_EventLimit = m_ScriptConfig.GetInt("EventLimit", 30);
308 m_KillTimedOutScripts = m_ScriptConfig.GetBoolean("KillTimedOutScripts", false); 308 m_KillTimedOutScripts = m_ScriptConfig.GetBoolean("KillTimedOutScripts", false);
309 m_SaveTime = m_ScriptConfig.GetInt("SaveInterval", 120) * 1000; 309 m_SaveTime = m_ScriptConfig.GetInt("SaveInterval", 120) * 1000;
310 m_WaitForEventCompletionOnScriptStop 310 m_WaitForEventCompletionOnScriptStop
311 = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop); 311 = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop);
312 312
313 m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines"); 313 m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines");
@@ -507,7 +507,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
507 { 507 {
508 string rawItemId; 508 string rawItemId;
509 UUID itemId = UUID.Zero; 509 UUID itemId = UUID.Zero;
510 510
511 if (cmdparams.Length == 2) 511 if (cmdparams.Length == 2)
512 { 512 {
513 IEnumerable<IScriptInstance> scripts = m_Scripts.Values; 513 IEnumerable<IScriptInstance> scripts = m_Scripts.Values;
@@ -520,17 +520,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
520 520
521 return; 521 return;
522 } 522 }
523 523
524 for (int i = 2; i < cmdparams.Length; i++) 524 for (int i = 2; i < cmdparams.Length; i++)
525 { 525 {
526 rawItemId = cmdparams[i]; 526 rawItemId = cmdparams[i];
527 527
528 if (!UUID.TryParse(rawItemId, out itemId)) 528 if (!UUID.TryParse(rawItemId, out itemId))
529 { 529 {
530 MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid UUID", rawItemId); 530 MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid UUID", rawItemId);
531 continue; 531 continue;
532 } 532 }
533 533
534 if (itemId != UUID.Zero) 534 if (itemId != UUID.Zero)
535 { 535 {
536 IScriptInstance instance = GetInstance(itemId); 536 IScriptInstance instance = GetInstance(itemId);
@@ -816,7 +816,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
816 { 816 {
817 if (!m_Enabled) 817 if (!m_Enabled)
818 return; 818 return;
819 819
820 lock (m_ScriptEngines) 820 lock (m_ScriptEngines)
821 { 821 {
822 if (m_ScriptEngines.Contains(this)) 822 if (m_ScriptEngines.Contains(this))
@@ -978,14 +978,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
978 SceneObjectPart part = 978 SceneObjectPart part =
979 m_Scene.GetSceneObjectPart( 979 m_Scene.GetSceneObjectPart(
980 localID); 980 localID);
981 981
982 TaskInventoryItem item = 982 TaskInventoryItem item =
983 part.Inventory.GetInventoryItem(itemID); 983 part.Inventory.GetInventoryItem(itemID);
984 984
985 ScenePresence presence = 985 ScenePresence presence =
986 m_Scene.GetScenePresence( 986 m_Scene.GetScenePresence(
987 item.OwnerID); 987 item.OwnerID);
988 988
989 if (presence != null) 989 if (presence != null)
990 { 990 {
991 presence.ControllingClient.SendAgentAlertMessage( 991 presence.ControllingClient.SendAgentAlertMessage(
@@ -1073,8 +1073,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1073 { 1073 {
1074 m_log.Error( 1074 m_log.Error(
1075 string.Format( 1075 string.Format(
1076 "[XEngine]: Failure in DoOnRezScriptQueue() for item {0} in {1}. Continuing. Exception ", 1076 "[XEngine]: Failure in DoOnRezScriptQueue() for item {0} in {1}. Continuing. Exception ",
1077 o[1], m_Scene.Name), 1077 o[1], m_Scene.Name),
1078 e); 1078 e);
1079 } 1079 }
1080 } 1080 }
@@ -1091,7 +1091,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1091 } 1091 }
1092 finally 1092 finally
1093 { 1093 {
1094 // FIXME: On failure we must trigger this even if the compile queue is not actually empty so that the 1094 // FIXME: On failure we must trigger this even if the compile queue is not actually empty so that the
1095 // RegionReadyModule is not forever waiting. This event really needs a different name. 1095 // RegionReadyModule is not forever waiting. This event really needs a different name.
1096 m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount, 1096 m_Scene.EventManager.TriggerEmptyScriptCompileQueue(m_ScriptFailCount,
1097 m_ScriptErrorMessage); 1097 m_ScriptErrorMessage);
@@ -1108,8 +1108,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1108 { 1108 {
1109 m_CurrentCompile = null; 1109 m_CurrentCompile = null;
1110 1110
1111 // This is to avoid a situation where the m_CompileQueue while loop above could complete but 1111 // This is to avoid a situation where the m_CompileQueue while loop above could complete but
1112 // OnRezScript() place a new script on the queue and check m_CurrentCompile = null before we hit 1112 // OnRezScript() place a new script on the queue and check m_CurrentCompile = null before we hit
1113 // this section. 1113 // this section.
1114 if (m_CompileQueue.Count > 0) 1114 if (m_CompileQueue.Count > 0)
1115 m_CurrentCompile = m_ThreadPool.QueueWorkItem(DoOnRezScriptQueue, null); 1115 m_CurrentCompile = m_ThreadPool.QueueWorkItem(DoOnRezScriptQueue, null);
@@ -1186,7 +1186,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1186 m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assemblyPath, out linemap); 1186 m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assemblyPath, out linemap);
1187 1187
1188// m_log.DebugFormat( 1188// m_log.DebugFormat(
1189// "[XENGINE]: Found assembly path {0} onrez {1} in {2}", 1189// "[XENGINE]: Found assembly path {0} onrez {1} in {2}",
1190// assemblyPath, item.ItemID, World.Name); 1190// assemblyPath, item.ItemID, World.Name);
1191 1191
1192 if (!m_AddingAssemblies.ContainsKey(assemblyPath)) { 1192 if (!m_AddingAssemblies.ContainsKey(assemblyPath)) {
@@ -1239,7 +1239,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1239 catch (Exception e) 1239 catch (Exception e)
1240 { 1240 {
1241// m_log.ErrorFormat( 1241// m_log.ErrorFormat(
1242// "[XEngine]: Exception when rezzing script with item ID {0}, {1}{2}", 1242// "[XEngine]: Exception when rezzing script with item ID {0}, {1}{2}",
1243// itemID, e.Message, e.StackTrace); 1243// itemID, e.Message, e.StackTrace);
1244 1244
1245 // try 1245 // try
@@ -1280,7 +1280,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1280 } 1280 }
1281 1281
1282 // optionaly do not load a assembly on top of a lot of to release memory 1282 // optionaly do not load a assembly on top of a lot of to release memory
1283 // only if logins disable since causes a lot of rubber banding 1283 // only if logins disable since causes a lot of rubber banding
1284 if(m_CompactMemOnLoad && !m_Scene.LoginsEnabled) 1284 if(m_CompactMemOnLoad && !m_Scene.LoginsEnabled)
1285 GC.Collect(2); 1285 GC.Collect(2);
1286 1286
@@ -1323,7 +1323,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1323 { 1323 {
1324 sandbox = AppDomain.CurrentDomain; 1324 sandbox = AppDomain.CurrentDomain;
1325 } 1325 }
1326 1326
1327 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel(); 1327 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
1328 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition(); 1328 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
1329 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet"); 1329 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
@@ -1331,7 +1331,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1331 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement); 1331 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
1332 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup; 1332 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
1333 //sandbox.SetAppDomainPolicy(sandboxPolicy); 1333 //sandbox.SetAppDomainPolicy(sandboxPolicy);
1334 1334
1335 m_AppDomains[appDomain] = sandbox; 1335 m_AppDomains[appDomain] = sandbox;
1336 1336
1337 m_DomainScripts[appDomain] = new List<UUID>(); 1337 m_DomainScripts[appDomain] = new List<UUID>();
@@ -1341,7 +1341,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1341 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString()); 1341 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
1342 m_ScriptErrorMessage += "Exception creating app domain:\n"; 1342 m_ScriptErrorMessage += "Exception creating app domain:\n";
1343 m_ScriptFailCount++; 1343 m_ScriptFailCount++;
1344 lock (m_AddingAssemblies) 1344 lock (m_AddingAssemblies)
1345 { 1345 {
1346 m_AddingAssemblies[assemblyPath]--; 1346 m_AddingAssemblies[assemblyPath]--;
1347 } 1347 }
@@ -1364,14 +1364,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1364 { 1364 {
1365 coopSleepHandle = new XEngineEventWaitHandle(false, EventResetMode.AutoReset); 1365 coopSleepHandle = new XEngineEventWaitHandle(false, EventResetMode.AutoReset);
1366 1366
1367 scriptObj 1367 scriptObj
1368 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap( 1368 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
1369 assemblyName.FullName, 1369 assemblyName.FullName,
1370 "SecondLife.XEngineScript", 1370 "SecondLife.XEngineScript",
1371 false, 1371 false,
1372 BindingFlags.Default, 1372 BindingFlags.Default,
1373 null, 1373 null,
1374 new object[] { coopSleepHandle }, 1374 new object[] { coopSleepHandle },
1375 null, 1375 null,
1376 null); 1376 null);
1377 1377
@@ -1383,7 +1383,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1383 1383
1384 try 1384 try
1385 { 1385 {
1386 scriptObj 1386 scriptObj
1387 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap( 1387 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
1388 assemblyName.FullName, 1388 assemblyName.FullName,
1389 "SecondLife.Script", 1389 "SecondLife.Script",
@@ -1398,7 +1398,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1398 { 1398 {
1399 m_log.Error( 1399 m_log.Error(
1400 string.Format( 1400 string.Format(
1401 "[XENGINE]: Could not load previous SecondLife.Script from assembly {0} in {1}. Not starting. Exception ", 1401 "[XENGINE]: Could not load previous SecondLife.Script from assembly {0} in {1}. Not starting. Exception ",
1402 assemblyName.FullName, World.Name), 1402 assemblyName.FullName, World.Name),
1403 e2); 1403 e2);
1404 1404
@@ -1412,7 +1412,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1412 { 1412 {
1413 try 1413 try
1414 { 1414 {
1415 scriptObj 1415 scriptObj
1416 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap( 1416 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
1417 assemblyName.FullName, 1417 assemblyName.FullName,
1418 "SecondLife.Script", 1418 "SecondLife.Script",
@@ -1432,7 +1432,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1432 1432
1433 try 1433 try
1434 { 1434 {
1435 scriptObj 1435 scriptObj
1436 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap( 1436 = (IScript)m_AppDomains[appDomain].CreateInstanceAndUnwrap(
1437 assemblyName.FullName, 1437 assemblyName.FullName,
1438 "SecondLife.XEngineScript", 1438 "SecondLife.XEngineScript",
@@ -1447,7 +1447,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1447 { 1447 {
1448 m_log.Error( 1448 m_log.Error(
1449 string.Format( 1449 string.Format(
1450 "[XENGINE]: Could not load previous SecondLife.XEngineScript from assembly {0} in {1}. Not starting. Exception ", 1450 "[XENGINE]: Could not load previous SecondLife.XEngineScript from assembly {0} in {1}. Not starting. Exception ",
1451 assemblyName.FullName, World.Name), 1451 assemblyName.FullName, World.Name),
1452 e2); 1452 e2);
1453 1453
@@ -1509,7 +1509,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1509 } 1509 }
1510 1510
1511 1511
1512 lock (m_AddingAssemblies) 1512 lock (m_AddingAssemblies)
1513 { 1513 {
1514 if (!m_Assemblies.ContainsKey(assetID)) 1514 if (!m_Assemblies.ContainsKey(assetID))
1515 m_Assemblies[assetID] = assemblyPath; 1515 m_Assemblies[assetID] = assemblyPath;
@@ -1517,7 +1517,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1517 m_AddingAssemblies[assemblyPath]--; 1517 m_AddingAssemblies[assemblyPath]--;
1518 } 1518 }
1519 1519
1520 if (instance != null) 1520 if (instance != null)
1521 instance.Init(); 1521 instance.Init();
1522 1522
1523 bool runIt; 1523 bool runIt;
@@ -1570,7 +1570,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1570 } 1570 }
1571 1571
1572 if (instance.StatePersistedHere) 1572 if (instance.StatePersistedHere)
1573 instance.RemoveState(); 1573 instance.RemoveState();
1574 1574
1575 instance.DestroyScriptInstance(); 1575 instance.DestroyScriptInstance();
1576 1576
@@ -1622,20 +1622,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1622 // Do not remove assembly files if another instance of the script 1622 // Do not remove assembly files if another instance of the script
1623 // is currently initialising 1623 // is currently initialising
1624 if (!m_AddingAssemblies.ContainsKey(m_Assemblies[assetID]) 1624 if (!m_AddingAssemblies.ContainsKey(m_Assemblies[assetID])
1625 || m_AddingAssemblies[m_Assemblies[assetID]] == 0) 1625 || m_AddingAssemblies[m_Assemblies[assetID]] == 0)
1626 { 1626 {
1627// m_log.DebugFormat("[XEngine] Removing unreferenced assembly {0}", m_Assemblies[assetID]); 1627// m_log.DebugFormat("[XEngine] Removing unreferenced assembly {0}", m_Assemblies[assetID]);
1628 try 1628 try
1629 { 1629 {
1630 if (File.Exists(m_Assemblies[assetID])) 1630 if (File.Exists(m_Assemblies[assetID]))
1631 File.Delete(m_Assemblies[assetID]); 1631 File.Delete(m_Assemblies[assetID]);
1632 1632
1633 if (File.Exists(m_Assemblies[assetID]+".text")) 1633 if (File.Exists(m_Assemblies[assetID]+".text"))
1634 File.Delete(m_Assemblies[assetID]+".text"); 1634 File.Delete(m_Assemblies[assetID]+".text");
1635 1635
1636 if (File.Exists(m_Assemblies[assetID]+".mdb")) 1636 if (File.Exists(m_Assemblies[assetID]+".mdb"))
1637 File.Delete(m_Assemblies[assetID]+".mdb"); 1637 File.Delete(m_Assemblies[assetID]+".mdb");
1638 1638
1639 if (File.Exists(m_Assemblies[assetID]+".map")) 1639 if (File.Exists(m_Assemblies[assetID]+".map"))
1640 File.Delete(m_Assemblies[assetID]+".map"); 1640 File.Delete(m_Assemblies[assetID]+".map");
1641 } 1641 }
@@ -1692,7 +1692,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1692 new WorkItemCallback(this.ProcessEventHandler), 1692 new WorkItemCallback(this.ProcessEventHandler),
1693 parms)); 1693 parms));
1694 } 1694 }
1695 1695
1696 /// <summary> 1696 /// <summary>
1697 /// Process a previously posted script event. 1697 /// Process a previously posted script event.
1698 /// </summary> 1698 /// </summary>
@@ -1703,7 +1703,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1703 Culture.SetCurrentCulture(); 1703 Culture.SetCurrentCulture();
1704 1704
1705 IScriptInstance instance = (ScriptInstance) parms; 1705 IScriptInstance instance = (ScriptInstance) parms;
1706 1706
1707// m_log.DebugFormat("[XEngine]: Processing event for {0}", instance); 1707// m_log.DebugFormat("[XEngine]: Processing event for {0}", instance);
1708 1708
1709 return instance.EventProcessor(); 1709 return instance.EventProcessor();
@@ -1736,7 +1736,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1736 instance = m_Scripts[itemID]; 1736 instance = m_Scripts[itemID];
1737 } 1737 }
1738 catch { /* ignore race conditions */ } 1738 catch { /* ignore race conditions */ }
1739 1739
1740 if (instance != null) 1740 if (instance != null)
1741 { 1741 {
1742 instance.PostEvent(p); 1742 instance.PostEvent(p);
@@ -1744,7 +1744,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1744 } 1744 }
1745 } 1745 }
1746 } 1746 }
1747 1747
1748 return result; 1748 return result;
1749 } 1749 }
1750 1750
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs b/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
index 9d9dee1..ede8ef3 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
60 public bool Wait(int t) 60 public bool Wait(int t)
61 { 61 {
62 // We use the integer version of WaitAll because the current version of SmartThreadPool has a bug with the 62 // We use the integer version of WaitAll because the current version of SmartThreadPool has a bug with the
63 // TimeSpan version. The number of milliseconds in TimeSpan is an int64 so when STP casts it down to an 63 // TimeSpan version. The number of milliseconds in TimeSpan is an int64 so when STP casts it down to an
64 // int (32-bit) we can end up with bad values. This occurs on Windows though curiously not on Mono 2.10.8 64 // int (32-bit) we can end up with bad values. This occurs on Windows though curiously not on Mono 2.10.8
65 // (or very likely other versions of Mono at least up until 3.0.3). 65 // (or very likely other versions of Mono at least up until 3.0.3).
66 return SmartThreadPool.WaitAll(new IWorkItemResult[] {wr}, t, false); 66 return SmartThreadPool.WaitAll(new IWorkItemResult[] {wr}, t, false);
generated by cgit v1.1 at 2024-12-18 22:32:19 +0000