diff options
Diffstat (limited to '')
22 files changed, 992 insertions, 888 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs index 3de9f36..a885b25 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs | |||
@@ -476,7 +476,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
476 | } | 476 | } |
477 | else | 477 | else |
478 | { | 478 | { |
479 | lock(cntable) cntable.Add(cnonce, nck); | 479 | lock (cntable) cntable.Add(cnonce, nck); |
480 | } | 480 | } |
481 | 481 | ||
482 | } | 482 | } |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index 0a0bf3f..c351272 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | |||
@@ -108,7 +108,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
108 | /// </summary> | 108 | /// </summary> |
109 | private void LoadHandlers() | 109 | private void LoadHandlers() |
110 | { | 110 | { |
111 | lock(handlers) | 111 | lock (handlers) |
112 | { | 112 | { |
113 | if (!handlersLoaded) | 113 | if (!handlersLoaded) |
114 | { | 114 | { |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 780d218..65603c5 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -238,7 +238,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
238 | Rest.Log.DebugFormat("{0} Inventory catalog requested for {1} {2}", | 238 | Rest.Log.DebugFormat("{0} Inventory catalog requested for {1} {2}", |
239 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); | 239 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); |
240 | 240 | ||
241 | lock(rdata) | 241 | lock (rdata) |
242 | { | 242 | { |
243 | if (!rdata.HaveInventory) | 243 | if (!rdata.HaveInventory) |
244 | { | 244 | { |
@@ -1869,7 +1869,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1869 | this.folders = folders; | 1869 | this.folders = folders; |
1870 | this.items = items; | 1870 | this.items = items; |
1871 | this.HaveInventory = true; | 1871 | this.HaveInventory = true; |
1872 | lock(this) | 1872 | lock (this) |
1873 | { | 1873 | { |
1874 | Monitor.Pulse(this); | 1874 | Monitor.Pulse(this); |
1875 | } | 1875 | } |
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index 69f9a16..7dc5b0c 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs | |||
@@ -729,13 +729,13 @@ namespace OpenSim.Data.MySQL | |||
729 | 729 | ||
730 | public RegionSettings LoadRegionSettings(LLUUID regionUUID) | 730 | public RegionSettings LoadRegionSettings(LLUUID regionUUID) |
731 | { | 731 | { |
732 | lock(m_dataSet) | 732 | lock (m_dataSet) |
733 | { | 733 | { |
734 | CheckConnection(); | 734 | CheckConnection(); |
735 | DataTable regionsettings = m_regionSettingsTable; | 735 | DataTable regionsettings = m_regionSettingsTable; |
736 | string searchExp = "regionUUID = '" + regionUUID.ToString() + "'"; | 736 | string searchExp = "regionUUID = '" + regionUUID.ToString() + "'"; |
737 | DataRow[] rawsettings = regionsettings.Select(searchExp); | 737 | DataRow[] rawsettings = regionsettings.Select(searchExp); |
738 | if(rawsettings.Length == 0) | 738 | if (rawsettings.Length == 0) |
739 | { | 739 | { |
740 | RegionSettings rs = new RegionSettings(); | 740 | RegionSettings rs = new RegionSettings(); |
741 | rs.RegionUUID = regionUUID; | 741 | rs.RegionUUID = regionUUID; |
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs index a3494cf..0e4a349 100644 --- a/OpenSim/Framework/Communications/IAvatarService.cs +++ b/OpenSim/Framework/Communications/IAvatarService.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Text; | 30 | using System.Text; |
4 | using libsecondlife; | 31 | using libsecondlife; |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 924a566..d77c82d 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -285,7 +285,7 @@ namespace OpenSim.Framework | |||
285 | { | 285 | { |
286 | get | 286 | get |
287 | { | 287 | { |
288 | if(m_regionSettings == null) | 288 | if (m_regionSettings == null) |
289 | { | 289 | { |
290 | m_regionSettings = new RegionSettings(); | 290 | m_regionSettings = new RegionSettings(); |
291 | } | 291 | } |
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 4043bca..06cf7bf 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -135,7 +135,7 @@ namespace OpenSim.Framework | |||
135 | 135 | ||
136 | public bool HandleIncomingConfiguration(string key, object value) | 136 | public bool HandleIncomingConfiguration(string key, object value) |
137 | { | 137 | { |
138 | switch(key) | 138 | switch (key) |
139 | { | 139 | { |
140 | case "region_flags": | 140 | case "region_flags": |
141 | Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value; | 141 | Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value; |
@@ -171,7 +171,7 @@ namespace OpenSim.Framework | |||
171 | break; | 171 | break; |
172 | case "sim_access": | 172 | case "sim_access": |
173 | int access = (int)value; | 173 | int access = (int)value; |
174 | if(access <= 13) | 174 | if (access <= 13) |
175 | m_Maturity = 0; | 175 | m_Maturity = 0; |
176 | else | 176 | else |
177 | m_Maturity = 1; | 177 | m_Maturity = 1; |
@@ -236,266 +236,266 @@ namespace OpenSim.Framework | |||
236 | 236 | ||
237 | private LLUUID m_RegionUUID = LLUUID.Zero; | 237 | private LLUUID m_RegionUUID = LLUUID.Zero; |
238 | 238 | ||
239 | public LLUUID RegionUUID | 239 | public LLUUID RegionUUID |
240 | { | 240 | { |
241 | get { return m_RegionUUID; } | 241 | get { return m_RegionUUID; } |
242 | set { m_RegionUUID = value; } | 242 | set { m_RegionUUID = value; } |
243 | } | 243 | } |
244 | 244 | ||
245 | private bool m_BlockTerraform = false; | 245 | private bool m_BlockTerraform = false; |
246 | 246 | ||
247 | public bool BlockTerraform | 247 | public bool BlockTerraform |
248 | { | 248 | { |
249 | get { return m_BlockTerraform; } | 249 | get { return m_BlockTerraform; } |
250 | set { m_BlockTerraform = value; } | 250 | set { m_BlockTerraform = value; } |
251 | } | 251 | } |
252 | 252 | ||
253 | private bool m_BlockFly = false; | 253 | private bool m_BlockFly = false; |
254 | 254 | ||
255 | public bool BlockFly | 255 | public bool BlockFly |
256 | { | 256 | { |
257 | get { return m_BlockFly; } | 257 | get { return m_BlockFly; } |
258 | set { m_BlockFly = value; } | 258 | set { m_BlockFly = value; } |
259 | } | 259 | } |
260 | 260 | ||
261 | private bool m_AllowDamage = false; | 261 | private bool m_AllowDamage = false; |
262 | 262 | ||
263 | public bool AllowDamage | 263 | public bool AllowDamage |
264 | { | 264 | { |
265 | get { return m_AllowDamage; } | 265 | get { return m_AllowDamage; } |
266 | set { m_AllowDamage = value; } | 266 | set { m_AllowDamage = value; } |
267 | } | 267 | } |
268 | 268 | ||
269 | private bool m_RestrictPushing = false; | 269 | private bool m_RestrictPushing = false; |
270 | 270 | ||
271 | public bool RestrictPushing | 271 | public bool RestrictPushing |
272 | { | 272 | { |
273 | get { return m_RestrictPushing; } | 273 | get { return m_RestrictPushing; } |
274 | set { m_RestrictPushing = value; } | 274 | set { m_RestrictPushing = value; } |
275 | } | 275 | } |
276 | 276 | ||
277 | private bool m_AllowLandResell = true; | 277 | private bool m_AllowLandResell = true; |
278 | 278 | ||
279 | public bool AllowLandResell | 279 | public bool AllowLandResell |
280 | { | 280 | { |
281 | get { return m_AllowLandResell; } | 281 | get { return m_AllowLandResell; } |
282 | set { m_AllowLandResell = value; } | 282 | set { m_AllowLandResell = value; } |
283 | } | 283 | } |
284 | 284 | ||
285 | private bool m_AllowLandJoinDivide = true; | 285 | private bool m_AllowLandJoinDivide = true; |
286 | 286 | ||
287 | public bool AllowLandJoinDivide | 287 | public bool AllowLandJoinDivide |
288 | { | 288 | { |
289 | get { return m_AllowLandJoinDivide; } | 289 | get { return m_AllowLandJoinDivide; } |
290 | set { m_AllowLandJoinDivide = value; } | 290 | set { m_AllowLandJoinDivide = value; } |
291 | } | 291 | } |
292 | 292 | ||
293 | private bool m_BlockShowInSearch = false; | 293 | private bool m_BlockShowInSearch = false; |
294 | 294 | ||
295 | public bool BlockShowInSearch | 295 | public bool BlockShowInSearch |
296 | { | 296 | { |
297 | get { return m_BlockShowInSearch; } | 297 | get { return m_BlockShowInSearch; } |
298 | set { m_BlockShowInSearch = value; } | 298 | set { m_BlockShowInSearch = value; } |
299 | } | 299 | } |
300 | 300 | ||
301 | private int m_AgentLimit = 40; | 301 | private int m_AgentLimit = 40; |
302 | 302 | ||
303 | public int AgentLimit | 303 | public int AgentLimit |
304 | { | 304 | { |
305 | get { return m_AgentLimit; } | 305 | get { return m_AgentLimit; } |
306 | set { m_AgentLimit = value; } | 306 | set { m_AgentLimit = value; } |
307 | } | 307 | } |
308 | 308 | ||
309 | private double m_ObjectBonus = 1.0; | 309 | private double m_ObjectBonus = 1.0; |
310 | 310 | ||
311 | public double ObjectBonus | 311 | public double ObjectBonus |
312 | { | 312 | { |
313 | get { return m_ObjectBonus; } | 313 | get { return m_ObjectBonus; } |
314 | set { m_ObjectBonus = value; } | 314 | set { m_ObjectBonus = value; } |
315 | } | 315 | } |
316 | 316 | ||
317 | private int m_Maturity = 1; | 317 | private int m_Maturity = 1; |
318 | 318 | ||
319 | public int Maturity | 319 | public int Maturity |
320 | { | 320 | { |
321 | get { return m_Maturity; } | 321 | get { return m_Maturity; } |
322 | set { m_Maturity = value; } | 322 | set { m_Maturity = value; } |
323 | } | 323 | } |
324 | 324 | ||
325 | private bool m_DisableScripts = false; | 325 | private bool m_DisableScripts = false; |
326 | 326 | ||
327 | public bool DisableScripts | 327 | public bool DisableScripts |
328 | { | 328 | { |
329 | get { return m_DisableScripts; } | 329 | get { return m_DisableScripts; } |
330 | set { m_DisableScripts = value; } | 330 | set { m_DisableScripts = value; } |
331 | } | 331 | } |
332 | 332 | ||
333 | private bool m_DisableCollisions = false; | 333 | private bool m_DisableCollisions = false; |
334 | 334 | ||
335 | public bool DisableCollisions | 335 | public bool DisableCollisions |
336 | { | 336 | { |
337 | get { return m_DisableCollisions; } | 337 | get { return m_DisableCollisions; } |
338 | set { m_DisableCollisions = value; } | 338 | set { m_DisableCollisions = value; } |
339 | } | 339 | } |
340 | 340 | ||
341 | private bool m_DisablePhysics = false; | 341 | private bool m_DisablePhysics = false; |
342 | 342 | ||
343 | public bool DisablePhysics | 343 | public bool DisablePhysics |
344 | { | 344 | { |
345 | get { return m_DisablePhysics; } | 345 | get { return m_DisablePhysics; } |
346 | set { m_DisablePhysics = value; } | 346 | set { m_DisablePhysics = value; } |
347 | } | 347 | } |
348 | 348 | ||
349 | private LLUUID m_TerrainTexture1 = LLUUID.Zero; | 349 | private LLUUID m_TerrainTexture1 = LLUUID.Zero; |
350 | 350 | ||
351 | public LLUUID TerrainTexture1 | 351 | public LLUUID TerrainTexture1 |
352 | { | 352 | { |
353 | get { return m_TerrainTexture1; } | 353 | get { return m_TerrainTexture1; } |
354 | set { m_TerrainTexture1 = value; } | 354 | set { m_TerrainTexture1 = value; } |
355 | } | 355 | } |
356 | 356 | ||
357 | private LLUUID m_TerrainTexture2 = LLUUID.Zero; | 357 | private LLUUID m_TerrainTexture2 = LLUUID.Zero; |
358 | 358 | ||
359 | public LLUUID TerrainTexture2 | 359 | public LLUUID TerrainTexture2 |
360 | { | 360 | { |
361 | get { return m_TerrainTexture2; } | 361 | get { return m_TerrainTexture2; } |
362 | set { m_TerrainTexture2 = value; } | 362 | set { m_TerrainTexture2 = value; } |
363 | } | 363 | } |
364 | 364 | ||
365 | private LLUUID m_TerrainTexture3 = LLUUID.Zero; | 365 | private LLUUID m_TerrainTexture3 = LLUUID.Zero; |
366 | 366 | ||
367 | public LLUUID TerrainTexture3 | 367 | public LLUUID TerrainTexture3 |
368 | { | 368 | { |
369 | get { return m_TerrainTexture3; } | 369 | get { return m_TerrainTexture3; } |
370 | set { m_TerrainTexture3 = value; } | 370 | set { m_TerrainTexture3 = value; } |
371 | } | 371 | } |
372 | 372 | ||
373 | private LLUUID m_TerrainTexture4 = LLUUID.Zero; | 373 | private LLUUID m_TerrainTexture4 = LLUUID.Zero; |
374 | 374 | ||
375 | public LLUUID TerrainTexture4 | 375 | public LLUUID TerrainTexture4 |
376 | { | 376 | { |
377 | get { return m_TerrainTexture4; } | 377 | get { return m_TerrainTexture4; } |
378 | set { m_TerrainTexture4 = value; } | 378 | set { m_TerrainTexture4 = value; } |
379 | } | 379 | } |
380 | 380 | ||
381 | private double m_Elevation1NW = 10; | 381 | private double m_Elevation1NW = 10; |
382 | 382 | ||
383 | public double Elevation1NW | 383 | public double Elevation1NW |
384 | { | 384 | { |
385 | get { return m_Elevation1NW; } | 385 | get { return m_Elevation1NW; } |
386 | set { m_Elevation1NW = value; } | 386 | set { m_Elevation1NW = value; } |
387 | } | 387 | } |
388 | 388 | ||
389 | private double m_Elevation2NW = 60; | 389 | private double m_Elevation2NW = 60; |
390 | 390 | ||
391 | public double Elevation2NW | 391 | public double Elevation2NW |
392 | { | 392 | { |
393 | get { return m_Elevation2NW; } | 393 | get { return m_Elevation2NW; } |
394 | set { m_Elevation2NW = value; } | 394 | set { m_Elevation2NW = value; } |
395 | } | 395 | } |
396 | 396 | ||
397 | private double m_Elevation1NE = 10; | 397 | private double m_Elevation1NE = 10; |
398 | 398 | ||
399 | public double Elevation1NE | 399 | public double Elevation1NE |
400 | { | 400 | { |
401 | get { return m_Elevation1NE; } | 401 | get { return m_Elevation1NE; } |
402 | set { m_Elevation1NE = value; } | 402 | set { m_Elevation1NE = value; } |
403 | } | 403 | } |
404 | 404 | ||
405 | private double m_Elevation2NE = 60; | 405 | private double m_Elevation2NE = 60; |
406 | 406 | ||
407 | public double Elevation2NE | 407 | public double Elevation2NE |
408 | { | 408 | { |
409 | get { return m_Elevation2NE; } | 409 | get { return m_Elevation2NE; } |
410 | set { m_Elevation2NE = value; } | 410 | set { m_Elevation2NE = value; } |
411 | } | 411 | } |
412 | 412 | ||
413 | private double m_Elevation1SE = 10; | 413 | private double m_Elevation1SE = 10; |
414 | 414 | ||
415 | public double Elevation1SE | 415 | public double Elevation1SE |
416 | { | 416 | { |
417 | get { return m_Elevation1SE; } | 417 | get { return m_Elevation1SE; } |
418 | set { m_Elevation1SE = value; } | 418 | set { m_Elevation1SE = value; } |
419 | } | 419 | } |
420 | 420 | ||
421 | private double m_Elevation2SE = 60; | 421 | private double m_Elevation2SE = 60; |
422 | 422 | ||
423 | public double Elevation2SE | 423 | public double Elevation2SE |
424 | { | 424 | { |
425 | get { return m_Elevation2SE; } | 425 | get { return m_Elevation2SE; } |
426 | set { m_Elevation2SE = value; } | 426 | set { m_Elevation2SE = value; } |
427 | } | 427 | } |
428 | 428 | ||
429 | private double m_Elevation1SW = 10; | 429 | private double m_Elevation1SW = 10; |
430 | 430 | ||
431 | public double Elevation1SW | 431 | public double Elevation1SW |
432 | { | 432 | { |
433 | get { return m_Elevation1SW; } | 433 | get { return m_Elevation1SW; } |
434 | set { m_Elevation1SW = value; } | 434 | set { m_Elevation1SW = value; } |
435 | } | 435 | } |
436 | 436 | ||
437 | private double m_Elevation2SW = 60; | 437 | private double m_Elevation2SW = 60; |
438 | 438 | ||
439 | public double Elevation2SW | 439 | public double Elevation2SW |
440 | { | 440 | { |
441 | get { return m_Elevation2SW; } | 441 | get { return m_Elevation2SW; } |
442 | set { m_Elevation2SW = value; } | 442 | set { m_Elevation2SW = value; } |
443 | } | 443 | } |
444 | 444 | ||
445 | private double m_WaterHeight = 20; | 445 | private double m_WaterHeight = 20; |
446 | 446 | ||
447 | public double WaterHeight | 447 | public double WaterHeight |
448 | { | 448 | { |
449 | get { return m_WaterHeight; } | 449 | get { return m_WaterHeight; } |
450 | set { m_WaterHeight = value; } | 450 | set { m_WaterHeight = value; } |
451 | } | 451 | } |
452 | 452 | ||
453 | private double m_TerrainRaiseLimit = 100; | 453 | private double m_TerrainRaiseLimit = 100; |
454 | 454 | ||
455 | public double TerrainRaiseLimit | 455 | public double TerrainRaiseLimit |
456 | { | 456 | { |
457 | get { return m_TerrainRaiseLimit; } | 457 | get { return m_TerrainRaiseLimit; } |
458 | set { m_TerrainRaiseLimit = value; } | 458 | set { m_TerrainRaiseLimit = value; } |
459 | } | 459 | } |
460 | 460 | ||
461 | private double m_TerrainLowerLimit = 100; | 461 | private double m_TerrainLowerLimit = 100; |
462 | 462 | ||
463 | public double TerrainLowerLimit | 463 | public double TerrainLowerLimit |
464 | { | 464 | { |
465 | get { return m_TerrainLowerLimit; } | 465 | get { return m_TerrainLowerLimit; } |
466 | set { m_TerrainLowerLimit = value; } | 466 | set { m_TerrainLowerLimit = value; } |
467 | } | 467 | } |
468 | 468 | ||
469 | private bool m_UseEstateSun = true; | 469 | private bool m_UseEstateSun = true; |
470 | 470 | ||
471 | public bool UseEstateSun | 471 | public bool UseEstateSun |
472 | { | 472 | { |
473 | get { return m_UseEstateSun; } | 473 | get { return m_UseEstateSun; } |
474 | set { m_UseEstateSun = value; } | 474 | set { m_UseEstateSun = value; } |
475 | } | 475 | } |
476 | 476 | ||
477 | private bool m_FixedSun = false; | 477 | private bool m_FixedSun = false; |
478 | 478 | ||
479 | public bool FixedSun | 479 | public bool FixedSun |
480 | { | 480 | { |
481 | get { return m_FixedSun; } | 481 | get { return m_FixedSun; } |
482 | set { m_FixedSun = value; } | 482 | set { m_FixedSun = value; } |
483 | } | 483 | } |
484 | 484 | ||
485 | private double m_SunPosition = 0.0; | 485 | private double m_SunPosition = 0.0; |
486 | 486 | ||
487 | public double SunPosition | 487 | public double SunPosition |
488 | { | 488 | { |
489 | get { return m_SunPosition; } | 489 | get { return m_SunPosition; } |
490 | set { m_SunPosition = value; } | 490 | set { m_SunPosition = value; } |
491 | } | 491 | } |
492 | 492 | ||
493 | private LLUUID m_Covenant = LLUUID.Zero; | 493 | private LLUUID m_Covenant = LLUUID.Zero; |
494 | 494 | ||
495 | public LLUUID Covenant | 495 | public LLUUID Covenant |
496 | { | 496 | { |
497 | get { return m_Covenant; } | 497 | get { return m_Covenant; } |
498 | set { m_Covenant = value; } | 498 | set { m_Covenant = value; } |
499 | } | 499 | } |
500 | } | 500 | } |
501 | } | 501 | } |
diff --git a/OpenSim/Framework/Servers/OSHttpRequestPump.cs b/OpenSim/Framework/Servers/OSHttpRequestPump.cs index 44fba47..78bd1e1 100644 --- a/OpenSim/Framework/Servers/OSHttpRequestPump.cs +++ b/OpenSim/Framework/Servers/OSHttpRequestPump.cs | |||
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.Servers | |||
116 | // we are either out of handlers or get back a | 116 | // we are either out of handlers or get back a |
117 | // Handled or Detached | 117 | // Handled or Detached |
118 | OSHttpHandlerResult rc = OSHttpHandlerResult.Unprocessed; | 118 | OSHttpHandlerResult rc = OSHttpHandlerResult.Unprocessed; |
119 | foreach(OSHttpHandler h in handlers) | 119 | foreach (OSHttpHandler h in handlers) |
120 | { | 120 | { |
121 | rc = h.Process(req); | 121 | rc = h.Process(req); |
122 | 122 | ||
diff --git a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs b/OpenSim/Region/Environment/Interfaces/IEmailModule.cs index aae5d9c..3726ba5 100644 --- a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs +++ b/OpenSim/Region/Environment/Interfaces/IEmailModule.cs | |||
@@ -31,18 +31,18 @@ using libsecondlife; | |||
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 32 | namespace OpenSim.Region.Environment.Interfaces |
33 | { | 33 | { |
34 | public class Email | 34 | public class Email |
35 | { | 35 | { |
36 | public string time; | 36 | public string time; |
37 | public string sender; | 37 | public string sender; |
38 | public string subject; | 38 | public string subject; |
39 | public string message; | 39 | public string message; |
40 | public int numLeft; | 40 | public int numLeft; |
41 | } | 41 | } |
42 | 42 | ||
43 | public interface IEmailModule : IRegionModule | 43 | public interface IEmailModule : IRegionModule |
44 | { | 44 | { |
45 | void SendEmail(LLUUID objectID, string address, string subject, string body); | 45 | void SendEmail(LLUUID objectID, string address, string subject, string body); |
46 | Email GetNextEmail(LLUUID objectID, string sender, string subject); | 46 | Email GetNextEmail(LLUUID objectID, string sender, string subject); |
47 | } | 47 | } |
48 | } | 48 | } |
diff --git a/OpenSim/Region/Environment/Interfaces/IScriptModule.cs b/OpenSim/Region/Environment/Interfaces/IScriptModule.cs index 7aecaf7..8d3868e 100644 --- a/OpenSim/Region/Environment/Interfaces/IScriptModule.cs +++ b/OpenSim/Region/Environment/Interfaces/IScriptModule.cs | |||
@@ -33,6 +33,6 @@ namespace OpenSim.Region.Environment.Interfaces | |||
33 | { | 33 | { |
34 | public interface IScriptModule : IRegionModule | 34 | public interface IScriptModule : IRegionModule |
35 | { | 35 | { |
36 | bool GetScriptRunning(LLUUID objectID, LLUUID itemID); | 36 | bool GetScriptRunning(LLUUID objectID, LLUUID itemID); |
37 | } | 37 | } |
38 | } | 38 | } |
diff --git a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs index 5d33b04..77b2d29 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs | |||
@@ -1,3 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
1 | using System; | 28 | using System; |
2 | using System.Reflection; | 29 | using System.Reflection; |
3 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
@@ -24,9 +51,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules | |||
24 | 51 | ||
25 | // Scenes by Region Handle | 52 | // Scenes by Region Handle |
26 | private Dictionary<ulong, Scene> m_Scenes = | 53 | private Dictionary<ulong, Scene> m_Scenes = |
27 | new Dictionary<ulong, Scene>(); | 54 | new Dictionary<ulong, Scene>(); |
28 | 55 | ||
29 | private bool m_Enabled = false; | 56 | private bool m_Enabled = false; |
30 | 57 | ||
31 | public void Initialise(Scene scene, IConfigSource config) | 58 | public void Initialise(Scene scene, IConfigSource config) |
32 | { | 59 | { |
@@ -34,8 +61,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules | |||
34 | 61 | ||
35 | IConfig startupConfig = m_Config.Configs["Startup"]; | 62 | IConfig startupConfig = m_Config.Configs["Startup"]; |
36 | 63 | ||
37 | m_Enabled = (startupConfig.GetString("emailmodule", | 64 | m_Enabled = (startupConfig.GetString("emailmodule", |
38 | "DefaultEmailModule") == "DefaultEmailModule"); | 65 | "DefaultEmailModule") == "DefaultEmailModule"); |
39 | 66 | ||
40 | // It's a go! | 67 | // It's a go! |
41 | if (m_Enabled) | 68 | if (m_Enabled) |
@@ -79,12 +106,12 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules | |||
79 | } | 106 | } |
80 | 107 | ||
81 | public void SendEmail(LLUUID objectID, string address, string subject, string body) | 108 | public void SendEmail(LLUUID objectID, string address, string subject, string body) |
82 | { | 109 | { |
83 | } | 110 | } |
84 | 111 | ||
85 | public Email GetNextEmail(LLUUID objectID, string sender, string subject) | 112 | public Email GetNextEmail(LLUUID objectID, string sender, string subject) |
86 | { | 113 | { |
87 | return null; | 114 | return null; |
88 | } | 115 | } |
89 | } | 116 | } |
90 | } | 117 | } |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 53681f8..d87b930 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -995,7 +995,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
995 | else | 995 | else |
996 | { | 996 | { |
997 | CachedUserInfo profile = CommsManager.UserProfileCacheService.GetUserDetails(avatarId); | 997 | CachedUserInfo profile = CommsManager.UserProfileCacheService.GetUserDetails(avatarId); |
998 | if(profile == null || profile.RootFolder == null) | 998 | if (profile == null || profile.RootFolder == null) |
999 | { | 999 | { |
1000 | m_log.ErrorFormat( | 1000 | m_log.ErrorFormat( |
1001 | "[PRIM INVENTORY]: " + | 1001 | "[PRIM INVENTORY]: " + |
@@ -1040,7 +1040,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1040 | return; | 1040 | return; |
1041 | } | 1041 | } |
1042 | 1042 | ||
1043 | if(part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.AllowInventoryDrop) == 0) | 1043 | if (part.OwnerID != destPart.OwnerID && (part.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.AllowInventoryDrop) == 0) |
1044 | { | 1044 | { |
1045 | // object cannot copy items to an object owned by a different owner | 1045 | // object cannot copy items to an object owned by a different owner |
1046 | // unless llAllowInventoryDrop has been called | 1046 | // unless llAllowInventoryDrop has been called |
@@ -1049,7 +1049,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1049 | } | 1049 | } |
1050 | 1050 | ||
1051 | // must have both move and modify permission to put an item in an object | 1051 | // must have both move and modify permission to put an item in an object |
1052 | if((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0 ) | 1052 | if ((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0) |
1053 | { | 1053 | { |
1054 | return; | 1054 | return; |
1055 | } | 1055 | } |
@@ -1099,7 +1099,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1099 | 1099 | ||
1100 | ScenePresence avatar; | 1100 | ScenePresence avatar; |
1101 | 1101 | ||
1102 | if(TryGetAvatar(srcTaskItem.OwnerID, out avatar)) | 1102 | if (TryGetAvatar(srcTaskItem.OwnerID, out avatar)) |
1103 | { | 1103 | { |
1104 | destPart.GetProperties(avatar.ControllingClient); | 1104 | destPart.GetProperties(avatar.ControllingClient); |
1105 | } | 1105 | } |
@@ -1108,7 +1108,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1108 | public void MoveTaskInventoryItems(LLUUID destID, string category, SceneObjectPart host, List<LLUUID> items) | 1108 | public void MoveTaskInventoryItems(LLUUID destID, string category, SceneObjectPart host, List<LLUUID> items) |
1109 | { | 1109 | { |
1110 | CachedUserInfo profile = CommsManager.UserProfileCacheService.GetUserDetails(destID); | 1110 | CachedUserInfo profile = CommsManager.UserProfileCacheService.GetUserDetails(destID); |
1111 | if(profile == null || profile.RootFolder == null) | 1111 | if (profile == null || profile.RootFolder == null) |
1112 | { | 1112 | { |
1113 | m_log.ErrorFormat( | 1113 | m_log.ErrorFormat( |
1114 | "[PRIM INVENTORY]: " + | 1114 | "[PRIM INVENTORY]: " + |
@@ -1325,8 +1325,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1325 | /// <param name="itemID"> </param> | 1325 | /// <param name="itemID"> </param> |
1326 | /// <param name="localID"></param> | 1326 | /// <param name="localID"></param> |
1327 | public void RezScript(LLUUID srcId, SceneObjectPart srcPart, LLUUID destId, int pin, int running, int start_param) | 1327 | public void RezScript(LLUUID srcId, SceneObjectPart srcPart, LLUUID destId, int pin, int running, int start_param) |
1328 | { | 1328 | { |
1329 | TaskInventoryItem srcTaskItem = srcPart.GetInventoryItem(srcId); | 1329 | TaskInventoryItem srcTaskItem = srcPart.GetInventoryItem(srcId); |
1330 | 1330 | ||
1331 | if (srcTaskItem == null) | 1331 | if (srcTaskItem == null) |
1332 | { | 1332 | { |
@@ -1348,29 +1348,29 @@ namespace OpenSim.Region.Environment.Scenes | |||
1348 | destId); | 1348 | destId); |
1349 | return; | 1349 | return; |
1350 | } | 1350 | } |
1351 | 1351 | ||
1352 | // Must own the object, and have modify rights | 1352 | // Must own the object, and have modify rights |
1353 | if(srcPart.OwnerID != destPart.OwnerID) | 1353 | if (srcPart.OwnerID != destPart.OwnerID) |
1354 | return; | 1354 | return; |
1355 | 1355 | ||
1356 | if((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0) | 1356 | if ((destPart.OwnerMask & (uint)PermissionMask.Modify) == 0) |
1357 | return; | 1357 | return; |
1358 | 1358 | ||
1359 | if (destPart.ScriptAccessPin != pin) | 1359 | if (destPart.ScriptAccessPin != pin) |
1360 | { | 1360 | { |
1361 | m_log.WarnFormat( | 1361 | m_log.WarnFormat( |
1362 | "[PRIM INVENTORY]: " + | 1362 | "[PRIM INVENTORY]: " + |
1363 | "Script in object {0} : {1}, attempted to load script {2} : {3} into object {4} : {5} with invalid pin {6}", | 1363 | "Script in object {0} : {1}, attempted to load script {2} : {3} into object {4} : {5} with invalid pin {6}", |
1364 | srcPart.Name, srcId, srcTaskItem.Name, srcTaskItem.ItemID, destPart.Name, destId, pin); | 1364 | srcPart.Name, srcId, srcTaskItem.Name, srcTaskItem.ItemID, destPart.Name, destId, pin); |
1365 | // the LSL Wiki says we are supposed to shout on the DEBUG_CHANNEL - | 1365 | // the LSL Wiki says we are supposed to shout on the DEBUG_CHANNEL - |
1366 | // "Object: Task Object trying to illegally load script onto task Other_Object!" | 1366 | // "Object: Task Object trying to illegally load script onto task Other_Object!" |
1367 | // How do we shout from in here? | 1367 | // How do we shout from in here? |
1368 | return; | 1368 | return; |
1369 | } | 1369 | } |
1370 | 1370 | ||
1371 | TaskInventoryItem destTaskItem = new TaskInventoryItem(); | 1371 | TaskInventoryItem destTaskItem = new TaskInventoryItem(); |
1372 | 1372 | ||
1373 | destTaskItem.ItemID = LLUUID.Random(); | 1373 | destTaskItem.ItemID = LLUUID.Random(); |
1374 | destTaskItem.CreatorID = srcTaskItem.CreatorID; | 1374 | destTaskItem.CreatorID = srcTaskItem.CreatorID; |
1375 | destTaskItem.AssetID = srcTaskItem.AssetID; | 1375 | destTaskItem.AssetID = srcTaskItem.AssetID; |
1376 | destTaskItem.GroupID = destPart.GroupID; | 1376 | destTaskItem.GroupID = destPart.GroupID; |
@@ -1405,25 +1405,25 @@ namespace OpenSim.Region.Environment.Scenes | |||
1405 | destTaskItem.Name = srcTaskItem.Name; | 1405 | destTaskItem.Name = srcTaskItem.Name; |
1406 | destTaskItem.InvType = srcTaskItem.InvType; | 1406 | destTaskItem.InvType = srcTaskItem.InvType; |
1407 | destTaskItem.Type = srcTaskItem.Type; | 1407 | destTaskItem.Type = srcTaskItem.Type; |
1408 | 1408 | ||
1409 | destPart.AddInventoryItemExclusive(destTaskItem); | 1409 | destPart.AddInventoryItemExclusive(destTaskItem); |
1410 | 1410 | ||
1411 | if (running > 0) | 1411 | if (running > 0) |
1412 | { | 1412 | { |
1413 | if (ExternalChecks.ExternalChecksCanRunScript(destTaskItem.AssetID, destPart.UUID, destPart.OwnerID)) | 1413 | if (ExternalChecks.ExternalChecksCanRunScript(destTaskItem.AssetID, destPart.UUID, destPart.OwnerID)) |
1414 | { | 1414 | { |
1415 | destPart.CreateScriptInstance(destTaskItem, 0, false); | 1415 | destPart.CreateScriptInstance(destTaskItem, 0, false); |
1416 | } | 1416 | } |
1417 | } | 1417 | } |
1418 | 1418 | ||
1419 | ScenePresence avatar; | 1419 | ScenePresence avatar; |
1420 | 1420 | ||
1421 | if(TryGetAvatar(srcTaskItem.OwnerID, out avatar)) | 1421 | if (TryGetAvatar(srcTaskItem.OwnerID, out avatar)) |
1422 | { | 1422 | { |
1423 | destPart.GetProperties(avatar.ControllingClient); | 1423 | destPart.GetProperties(avatar.ControllingClient); |
1424 | } | 1424 | } |
1425 | } | 1425 | } |
1426 | 1426 | ||
1427 | /// <summary> | 1427 | /// <summary> |
1428 | /// Called when an object is removed from the environment into inventory. | 1428 | /// Called when an object is removed from the environment into inventory. |
1429 | /// </summary> | 1429 | /// </summary> |
@@ -1497,7 +1497,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1497 | m_inventoryTicker.Elapsed += InventoryRunDeleteTimer; | 1497 | m_inventoryTicker.Elapsed += InventoryRunDeleteTimer; |
1498 | } | 1498 | } |
1499 | 1499 | ||
1500 | lock(m_inventoryDeletes) | 1500 | lock (m_inventoryDeletes) |
1501 | { | 1501 | { |
1502 | DeleteToInventoryHolder dtis = new DeleteToInventoryHolder(); | 1502 | DeleteToInventoryHolder dtis = new DeleteToInventoryHolder(); |
1503 | dtis.DeRezPacket = DeRezPacket; | 1503 | dtis.DeRezPacket = DeRezPacket; |
@@ -2246,7 +2246,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2246 | public void GetScriptRunning(IClientAPI controllingClient, LLUUID objectID, LLUUID itemID) | 2246 | public void GetScriptRunning(IClientAPI controllingClient, LLUUID objectID, LLUUID itemID) |
2247 | { | 2247 | { |
2248 | IScriptModule scriptModule = RequestModuleInterface<IScriptModule>(); | 2248 | IScriptModule scriptModule = RequestModuleInterface<IScriptModule>(); |
2249 | if(scriptModule == null) | 2249 | if (scriptModule == null) |
2250 | return; | 2250 | return; |
2251 | 2251 | ||
2252 | controllingClient.SendScriptRunningReply(objectID, itemID, | 2252 | controllingClient.SendScriptRunningReply(objectID, itemID, |
@@ -2256,10 +2256,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
2256 | public void SetScriptRunning(IClientAPI controllingClient, LLUUID objectID, LLUUID itemID, bool running) | 2256 | public void SetScriptRunning(IClientAPI controllingClient, LLUUID objectID, LLUUID itemID, bool running) |
2257 | { | 2257 | { |
2258 | SceneObjectPart part = GetSceneObjectPart(objectID); | 2258 | SceneObjectPart part = GetSceneObjectPart(objectID); |
2259 | if(part == null) | 2259 | if (part == null) |
2260 | return; | 2260 | return; |
2261 | 2261 | ||
2262 | if(running) | 2262 | if (running) |
2263 | EventManager.TriggerStartScript(part.LocalId, itemID); | 2263 | EventManager.TriggerStartScript(part.LocalId, itemID); |
2264 | else | 2264 | else |
2265 | EventManager.TriggerStopScript(part.LocalId, itemID); | 2265 | EventManager.TriggerStopScript(part.LocalId, itemID); |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index fea131e..2db309a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |||
@@ -292,7 +292,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
292 | public void AddInventoryItemExclusive(TaskInventoryItem item) | 292 | public void AddInventoryItemExclusive(TaskInventoryItem item) |
293 | { | 293 | { |
294 | List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_taskInventory.Values); | 294 | List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_taskInventory.Values); |
295 | foreach(TaskInventoryItem i in il) | 295 | foreach (TaskInventoryItem i in il) |
296 | { | 296 | { |
297 | if (i.Name == item.Name) | 297 | if (i.Name == item.Name) |
298 | { | 298 | { |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 5b92a8d..2b40ad2 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1,5 +1,3 @@ | |||
1 | #region Header | ||
2 | |||
3 | /* | 1 | /* |
4 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
5 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
@@ -27,8 +25,6 @@ | |||
27 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
28 | */ | 26 | */ |
29 | 27 | ||
30 | #endregion Header | ||
31 | |||
32 | using System; | 28 | using System; |
33 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
34 | using System.Drawing; | 30 | using System.Drawing; |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 3daa680..22ca159 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1093,8 +1093,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1093 | ); | 1093 | ); |
1094 | 1094 | ||
1095 | //look for prims with explicit sit targets that are available | 1095 | //look for prims with explicit sit targets that are available |
1096 | foreach(SceneObjectPart part in partArray) { | 1096 | foreach (SceneObjectPart part in partArray) |
1097 | 1097 | { | |
1098 | // Is a sit target available? | 1098 | // Is a sit target available? |
1099 | Vector3 avSitOffSet = part.GetSitTargetPosition(); | 1099 | Vector3 avSitOffSet = part.GetSitTargetPosition(); |
1100 | Quaternion avSitOrientation = part.GetSitTargetOrientation(); | 1100 | Quaternion avSitOrientation = part.GetSitTargetOrientation(); |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 8da164c..3a866db 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -3211,7 +3211,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
3211 | { | 3211 | { |
3212 | m_host.AddScriptLPS(1); | 3212 | m_host.AddScriptLPS(1); |
3213 | 3213 | ||
3214 | if(add != 0) | 3214 | if (add != 0) |
3215 | m_host.ParentGroup.RootPart.AllowedDrop = true; | 3215 | m_host.ParentGroup.RootPart.AllowedDrop = true; |
3216 | else | 3216 | else |
3217 | m_host.ParentGroup.RootPart.AllowedDrop = false; | 3217 | m_host.ParentGroup.RootPart.AllowedDrop = false; |
@@ -4408,7 +4408,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4408 | { | 4408 | { |
4409 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) | 4409 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) |
4410 | { | 4410 | { |
4411 | if(inv.Value.Name == name) | 4411 | if (inv.Value.Name == name) |
4412 | return inv.Key; | 4412 | return inv.Key; |
4413 | } | 4413 | } |
4414 | return LLUUID.Zero; | 4414 | return LLUUID.Zero; |
@@ -4419,7 +4419,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4419 | m_host.AddScriptLPS(1); | 4419 | m_host.AddScriptLPS(1); |
4420 | 4420 | ||
4421 | LLUUID destID; | 4421 | LLUUID destID; |
4422 | if(!LLUUID.TryParse(destination, out destID)) | 4422 | if (!LLUUID.TryParse(destination, out destID)) |
4423 | return; | 4423 | return; |
4424 | 4424 | ||
4425 | List<LLUUID> itemList = new List<LLUUID>(); | 4425 | List<LLUUID> itemList = new List<LLUUID>(); |
@@ -4427,19 +4427,19 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4427 | foreach (Object item in inventory.Data) | 4427 | foreach (Object item in inventory.Data) |
4428 | { | 4428 | { |
4429 | LLUUID itemID; | 4429 | LLUUID itemID; |
4430 | if(LLUUID.TryParse(item.ToString(), out itemID)) | 4430 | if (LLUUID.TryParse(item.ToString(), out itemID)) |
4431 | { | 4431 | { |
4432 | itemList.Add(itemID); | 4432 | itemList.Add(itemID); |
4433 | } | 4433 | } |
4434 | else | 4434 | else |
4435 | { | 4435 | { |
4436 | itemID = GetTaskInventoryItem(item.ToString()); | 4436 | itemID = GetTaskInventoryItem(item.ToString()); |
4437 | if(itemID != LLUUID.Zero) | 4437 | if (itemID != LLUUID.Zero) |
4438 | itemList.Add(itemID); | 4438 | itemList.Add(itemID); |
4439 | } | 4439 | } |
4440 | } | 4440 | } |
4441 | 4441 | ||
4442 | if(itemList.Count == 0) | 4442 | if (itemList.Count == 0) |
4443 | return; | 4443 | return; |
4444 | 4444 | ||
4445 | m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList); | 4445 | m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList); |
@@ -4686,7 +4686,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4686 | { | 4686 | { |
4687 | m_host.AddScriptLPS(1); | 4687 | m_host.AddScriptLPS(1); |
4688 | 4688 | ||
4689 | m_host.ScriptAccessPin = pin; | 4689 | m_host.ScriptAccessPin = pin; |
4690 | } | 4690 | } |
4691 | 4691 | ||
4692 | public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param) | 4692 | public void llRemoteLoadScriptPin(string target, string name, int pin, int running, int start_param) |
@@ -4701,38 +4701,38 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
4701 | llSay(0, "Could not parse key " + target); | 4701 | llSay(0, "Could not parse key " + target); |
4702 | return; | 4702 | return; |
4703 | } | 4703 | } |
4704 | 4704 | ||
4705 | // target must be a different prim than the one containing the script | 4705 | // target must be a different prim than the one containing the script |
4706 | if (m_host.UUID == destId) | 4706 | if (m_host.UUID == destId) |
4707 | { | 4707 | { |
4708 | return; | 4708 | return; |
4709 | } | 4709 | } |
4710 | 4710 | ||
4711 | // copy the first script found with this inventory name | 4711 | // copy the first script found with this inventory name |
4712 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) | 4712 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) |
4713 | { | 4713 | { |
4714 | if (inv.Value.Name == name) | 4714 | if (inv.Value.Name == name) |
4715 | { | 4715 | { |
4716 | // make sure the object is a script | 4716 | // make sure the object is a script |
4717 | if(10 == inv.Value.Type) | 4717 | if (10 == inv.Value.Type) |
4718 | { | 4718 | { |
4719 | found = true; | 4719 | found = true; |
4720 | srcId = inv.Key; | 4720 | srcId = inv.Key; |
4721 | break; | 4721 | break; |
4722 | } | 4722 | } |
4723 | } | 4723 | } |
4724 | } | 4724 | } |
4725 | 4725 | ||
4726 | if (!found) | 4726 | if (!found) |
4727 | { | 4727 | { |
4728 | llSay(0, "Could not find script " + name); | 4728 | llSay(0, "Could not find script " + name); |
4729 | return; | 4729 | return; |
4730 | } | 4730 | } |
4731 | 4731 | ||
4732 | // the rest of the permission checks are done in RezScript, so check the pin there as well | 4732 | // the rest of the permission checks are done in RezScript, so check the pin there as well |
4733 | World.RezScript(srcId, m_host, destId, pin, running, start_param); | 4733 | World.RezScript(srcId, m_host, destId, pin, running, start_param); |
4734 | // this will cause the delay even if the script pin or permissions were wrong - seems ok | 4734 | // this will cause the delay even if the script pin or permissions were wrong - seems ok |
4735 | System.Threading.Thread.Sleep(3000); | 4735 | System.Threading.Thread.Sleep(3000); |
4736 | } | 4736 | } |
4737 | 4737 | ||
4738 | // remote_data(integer type, key channel, key message_id, string sender, integer ival, string sval) | 4738 | // remote_data(integer type, key channel, key message_id, string sender, integer ival, string sval) |
@@ -5072,15 +5072,15 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5072 | shapeBlock.ObjectLocalID = m_host.LocalId; | 5072 | shapeBlock.ObjectLocalID = m_host.LocalId; |
5073 | shapeBlock.PathScaleX = 100; | 5073 | shapeBlock.PathScaleX = 100; |
5074 | shapeBlock.PathScaleY = 150; | 5074 | shapeBlock.PathScaleY = 150; |
5075 | 5075 | ||
5076 | if (type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_CYLINDER && | 5076 | if (type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_CYLINDER && |
5077 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_PLANE && | 5077 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_PLANE && |
5078 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE && | 5078 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE && |
5079 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_TORUS) | 5079 | type != (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_TORUS) |
5080 | { | 5080 | { |
5081 | // default | 5081 | // default |
5082 | type = (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE; | 5082 | type = (int)BuiltIn_Commands_BaseClass.PRIM_SCULPT_TYPE_SPHERE; |
5083 | } | 5083 | } |
5084 | 5084 | ||
5085 | // retain pathcurve | 5085 | // retain pathcurve |
5086 | shapeBlock.PathCurve = m_host.Shape.PathCurve; | 5086 | shapeBlock.PathCurve = m_host.Shape.PathCurve; |
@@ -5157,7 +5157,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5157 | SetRot(part, q); | 5157 | SetRot(part, q); |
5158 | 5158 | ||
5159 | break; | 5159 | break; |
5160 | 5160 | ||
5161 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE: | 5161 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE: |
5162 | if (remain < 3) | 5162 | if (remain < 3) |
5163 | return; | 5163 | return; |
@@ -5175,7 +5175,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5175 | LSL_Types.Vector3 holesize; | 5175 | LSL_Types.Vector3 holesize; |
5176 | LSL_Types.Vector3 profilecut; | 5176 | LSL_Types.Vector3 profilecut; |
5177 | 5177 | ||
5178 | switch(code) | 5178 | switch (code) |
5179 | { | 5179 | { |
5180 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX: | 5180 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_BOX: |
5181 | if (remain < 6) | 5181 | if (remain < 6) |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index bfdc686..1e2e573 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
@@ -1295,7 +1295,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1295 | 1295 | ||
1296 | public override bool Equals(Object o) | 1296 | public override bool Equals(Object o) |
1297 | { | 1297 | { |
1298 | if(!(o is LSLInteger)) | 1298 | if (!(o is LSLInteger)) |
1299 | return false; | 1299 | return false; |
1300 | return value == ((LSLInteger)o).value; | 1300 | return value == ((LSLInteger)o).value; |
1301 | } | 1301 | } |
@@ -1452,7 +1452,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1452 | 1452 | ||
1453 | public override bool Equals(Object o) | 1453 | public override bool Equals(Object o) |
1454 | { | 1454 | { |
1455 | if(!(o is LSLFloat)) | 1455 | if (!(o is LSLFloat)) |
1456 | return false; | 1456 | return false; |
1457 | return value == ((LSLFloat)o).value; | 1457 | return value == ((LSLFloat)o).value; |
1458 | } | 1458 | } |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs index c7fda9c..f3c19d8 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.lexer.cs | |||
@@ -1,3 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
1 | using System;using Tools; | 28 | using System;using Tools; |
2 | //%+STRING_CONSTANT+3 | 29 | //%+STRING_CONSTANT+3 |
3 | public class STRING_CONSTANT : TOKEN{ | 30 | public class STRING_CONSTANT : TOKEN{ |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.parser.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.parser.cs index adcf90a..fdb538b 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.parser.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/lsl.parser.cs | |||
@@ -1,3 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
1 | using System;using Tools; | 28 | using System;using Tools; |
2 | //%+LSLProgramRoot+95 | 29 | //%+LSLProgramRoot+95 |
3 | public class LSLProgramRoot : SYMBOL{ | 30 | public class LSLProgramRoot : SYMBOL{ |
@@ -615,1005 +642,1005 @@ public IncrementDecrementExpression(Parser yyp):base(yyp){}} | |||
615 | 642 | ||
616 | public class LSLProgramRoot_1 : LSLProgramRoot { | 643 | public class LSLProgramRoot_1 : LSLProgramRoot { |
617 | public LSLProgramRoot_1(Parser yyq):base(yyq, | 644 | public LSLProgramRoot_1(Parser yyq):base(yyq, |
618 | ((GlobalDefinitions)(yyq.StackAt(1).m_value)) | 645 | ((GlobalDefinitions)(yyq.StackAt(1).m_value)) |
619 | , | 646 | , |
620 | ((States)(yyq.StackAt(0).m_value)) | 647 | ((States)(yyq.StackAt(0).m_value)) |
621 | ){}} | 648 | ){}} |
622 | 649 | ||
623 | public class LSLProgramRoot_2 : LSLProgramRoot { | 650 | public class LSLProgramRoot_2 : LSLProgramRoot { |
624 | public LSLProgramRoot_2(Parser yyq):base(yyq, | 651 | public LSLProgramRoot_2(Parser yyq):base(yyq, |
625 | ((States)(yyq.StackAt(0).m_value)) | 652 | ((States)(yyq.StackAt(0).m_value)) |
626 | ){}} | 653 | ){}} |
627 | 654 | ||
628 | public class GlobalDefinitions_1 : GlobalDefinitions { | 655 | public class GlobalDefinitions_1 : GlobalDefinitions { |
629 | public GlobalDefinitions_1(Parser yyq):base(yyq, | 656 | public GlobalDefinitions_1(Parser yyq):base(yyq, |
630 | ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) | 657 | ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) |
631 | ){}} | 658 | ){}} |
632 | 659 | ||
633 | public class GlobalDefinitions_2 : GlobalDefinitions { | 660 | public class GlobalDefinitions_2 : GlobalDefinitions { |
634 | public GlobalDefinitions_2(Parser yyq):base(yyq, | 661 | public GlobalDefinitions_2(Parser yyq):base(yyq, |
635 | ((GlobalDefinitions)(yyq.StackAt(1).m_value)) | 662 | ((GlobalDefinitions)(yyq.StackAt(1).m_value)) |
636 | , | 663 | , |
637 | ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) | 664 | ((GlobalVariableDeclaration)(yyq.StackAt(0).m_value)) |
638 | ){}} | 665 | ){}} |
639 | 666 | ||
640 | public class GlobalDefinitions_3 : GlobalDefinitions { | 667 | public class GlobalDefinitions_3 : GlobalDefinitions { |
641 | public GlobalDefinitions_3(Parser yyq):base(yyq, | 668 | public GlobalDefinitions_3(Parser yyq):base(yyq, |
642 | ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) | 669 | ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) |
643 | ){}} | 670 | ){}} |
644 | 671 | ||
645 | public class GlobalDefinitions_4 : GlobalDefinitions { | 672 | public class GlobalDefinitions_4 : GlobalDefinitions { |
646 | public GlobalDefinitions_4(Parser yyq):base(yyq, | 673 | public GlobalDefinitions_4(Parser yyq):base(yyq, |
647 | ((GlobalDefinitions)(yyq.StackAt(1).m_value)) | 674 | ((GlobalDefinitions)(yyq.StackAt(1).m_value)) |
648 | , | 675 | , |
649 | ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) | 676 | ((GlobalFunctionDefinition)(yyq.StackAt(0).m_value)) |
650 | ){}} | 677 | ){}} |
651 | 678 | ||
652 | public class GlobalVariableDeclaration_1 : GlobalVariableDeclaration { | 679 | public class GlobalVariableDeclaration_1 : GlobalVariableDeclaration { |
653 | public GlobalVariableDeclaration_1(Parser yyq):base(yyq, | 680 | public GlobalVariableDeclaration_1(Parser yyq):base(yyq, |
654 | ((Declaration)(yyq.StackAt(1).m_value)) | 681 | ((Declaration)(yyq.StackAt(1).m_value)) |
655 | ){}} | 682 | ){}} |
656 | 683 | ||
657 | public class GlobalVariableDeclaration_2 : GlobalVariableDeclaration { | 684 | public class GlobalVariableDeclaration_2 : GlobalVariableDeclaration { |
658 | public GlobalVariableDeclaration_2(Parser yyq):base(yyq,new Assignment(((LSLSyntax | 685 | public GlobalVariableDeclaration_2(Parser yyq):base(yyq,new Assignment(((LSLSyntax |
659 | )yyq), | 686 | )yyq), |
660 | ((Declaration)(yyq.StackAt(3).m_value)) | 687 | ((Declaration)(yyq.StackAt(3).m_value)) |
661 | , | 688 | , |
662 | ((Expression)(yyq.StackAt(1).m_value)) | 689 | ((Expression)(yyq.StackAt(1).m_value)) |
663 | , | 690 | , |
664 | ((EQUALS)(yyq.StackAt(2).m_value)) | 691 | ((EQUALS)(yyq.StackAt(2).m_value)) |
665 | .yytext)){}} | 692 | .yytext)){}} |
666 | 693 | ||
667 | public class GlobalFunctionDefinition_1 : GlobalFunctionDefinition { | 694 | public class GlobalFunctionDefinition_1 : GlobalFunctionDefinition { |
668 | public GlobalFunctionDefinition_1(Parser yyq):base(yyq,"void", | 695 | public GlobalFunctionDefinition_1(Parser yyq):base(yyq,"void", |
669 | ((IDENT)(yyq.StackAt(4).m_value)) | 696 | ((IDENT)(yyq.StackAt(4).m_value)) |
670 | .yytext, | 697 | .yytext, |
671 | ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) | 698 | ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) |
672 | , | 699 | , |
673 | ((CompoundStatement)(yyq.StackAt(0).m_value)) | 700 | ((CompoundStatement)(yyq.StackAt(0).m_value)) |
674 | ){}} | 701 | ){}} |
675 | 702 | ||
676 | public class GlobalFunctionDefinition_2 : GlobalFunctionDefinition { | 703 | public class GlobalFunctionDefinition_2 : GlobalFunctionDefinition { |
677 | public GlobalFunctionDefinition_2(Parser yyq):base(yyq, | 704 | public GlobalFunctionDefinition_2(Parser yyq):base(yyq, |
678 | ((Typename)(yyq.StackAt(5).m_value)) | 705 | ((Typename)(yyq.StackAt(5).m_value)) |
679 | .yytext, | 706 | .yytext, |
680 | ((IDENT)(yyq.StackAt(4).m_value)) | 707 | ((IDENT)(yyq.StackAt(4).m_value)) |
681 | .yytext, | 708 | .yytext, |
682 | ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) | 709 | ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) |
683 | , | 710 | , |
684 | ((CompoundStatement)(yyq.StackAt(0).m_value)) | 711 | ((CompoundStatement)(yyq.StackAt(0).m_value)) |
685 | ){}} | 712 | ){}} |
686 | 713 | ||
687 | public class States_1 : States { | 714 | public class States_1 : States { |
688 | public States_1(Parser yyq):base(yyq, | 715 | public States_1(Parser yyq):base(yyq, |
689 | ((State)(yyq.StackAt(0).m_value)) | 716 | ((State)(yyq.StackAt(0).m_value)) |
690 | ){}} | 717 | ){}} |
691 | 718 | ||
692 | public class States_2 : States { | 719 | public class States_2 : States { |
693 | public States_2(Parser yyq):base(yyq, | 720 | public States_2(Parser yyq):base(yyq, |
694 | ((States)(yyq.StackAt(1).m_value)) | 721 | ((States)(yyq.StackAt(1).m_value)) |
695 | , | 722 | , |
696 | ((State)(yyq.StackAt(0).m_value)) | 723 | ((State)(yyq.StackAt(0).m_value)) |
697 | ){}} | 724 | ){}} |
698 | 725 | ||
699 | public class State_1 : State { | 726 | public class State_1 : State { |
700 | public State_1(Parser yyq):base(yyq, | 727 | public State_1(Parser yyq):base(yyq, |
701 | ((DEFAULT_STATE)(yyq.StackAt(3).m_value)) | 728 | ((DEFAULT_STATE)(yyq.StackAt(3).m_value)) |
702 | .yytext, | 729 | .yytext, |
703 | ((StateBody)(yyq.StackAt(1).m_value)) | 730 | ((StateBody)(yyq.StackAt(1).m_value)) |
704 | ){}} | 731 | ){}} |
705 | 732 | ||
706 | public class State_2 : State { | 733 | public class State_2 : State { |
707 | public State_2(Parser yyq):base(yyq, | 734 | public State_2(Parser yyq):base(yyq, |
708 | ((IDENT)(yyq.StackAt(3).m_value)) | 735 | ((IDENT)(yyq.StackAt(3).m_value)) |
709 | .yytext, | 736 | .yytext, |
710 | ((StateBody)(yyq.StackAt(1).m_value)) | 737 | ((StateBody)(yyq.StackAt(1).m_value)) |
711 | ){}} | 738 | ){}} |
712 | 739 | ||
713 | public class StateBody_1 : StateBody { | 740 | public class StateBody_1 : StateBody { |
714 | public StateBody_1(Parser yyq):base(yyq, | 741 | public StateBody_1(Parser yyq):base(yyq, |
715 | ((StateEvent)(yyq.StackAt(0).m_value)) | 742 | ((StateEvent)(yyq.StackAt(0).m_value)) |
716 | ){}} | 743 | ){}} |
717 | 744 | ||
718 | public class StateBody_2 : StateBody { | 745 | public class StateBody_2 : StateBody { |
719 | public StateBody_2(Parser yyq):base(yyq, | 746 | public StateBody_2(Parser yyq):base(yyq, |
720 | ((StateBody)(yyq.StackAt(1).m_value)) | 747 | ((StateBody)(yyq.StackAt(1).m_value)) |
721 | , | 748 | , |
722 | ((StateEvent)(yyq.StackAt(0).m_value)) | 749 | ((StateEvent)(yyq.StackAt(0).m_value)) |
723 | ){}} | 750 | ){}} |
724 | 751 | ||
725 | public class StateEvent_1 : StateEvent { | 752 | public class StateEvent_1 : StateEvent { |
726 | public StateEvent_1(Parser yyq):base(yyq, | 753 | public StateEvent_1(Parser yyq):base(yyq, |
727 | ((Event)(yyq.StackAt(4).m_value)) | 754 | ((Event)(yyq.StackAt(4).m_value)) |
728 | .yytext, | 755 | .yytext, |
729 | ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) | 756 | ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) |
730 | , | 757 | , |
731 | ((CompoundStatement)(yyq.StackAt(0).m_value)) | 758 | ((CompoundStatement)(yyq.StackAt(0).m_value)) |
732 | ){}} | 759 | ){}} |
733 | 760 | ||
734 | public class ArgumentDeclarationList_1 : ArgumentDeclarationList { | 761 | public class ArgumentDeclarationList_1 : ArgumentDeclarationList { |
735 | public ArgumentDeclarationList_1(Parser yyq):base(yyq, | 762 | public ArgumentDeclarationList_1(Parser yyq):base(yyq, |
736 | ((Declaration)(yyq.StackAt(0).m_value)) | 763 | ((Declaration)(yyq.StackAt(0).m_value)) |
737 | ){}} | 764 | ){}} |
738 | 765 | ||
739 | public class ArgumentDeclarationList_2 : ArgumentDeclarationList { | 766 | public class ArgumentDeclarationList_2 : ArgumentDeclarationList { |
740 | public ArgumentDeclarationList_2(Parser yyq):base(yyq, | 767 | public ArgumentDeclarationList_2(Parser yyq):base(yyq, |
741 | ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) | 768 | ((ArgumentDeclarationList)(yyq.StackAt(2).m_value)) |
742 | , | 769 | , |
743 | ((Declaration)(yyq.StackAt(0).m_value)) | 770 | ((Declaration)(yyq.StackAt(0).m_value)) |
744 | ){}} | 771 | ){}} |
745 | 772 | ||
746 | public class Declaration_1 : Declaration { | 773 | public class Declaration_1 : Declaration { |
747 | public Declaration_1(Parser yyq):base(yyq, | 774 | public Declaration_1(Parser yyq):base(yyq, |
748 | ((Typename)(yyq.StackAt(1).m_value)) | 775 | ((Typename)(yyq.StackAt(1).m_value)) |
749 | .yytext, | 776 | .yytext, |
750 | ((IDENT)(yyq.StackAt(0).m_value)) | 777 | ((IDENT)(yyq.StackAt(0).m_value)) |
751 | .yytext){}} | 778 | .yytext){}} |
752 | 779 | ||
753 | public class CompoundStatement_1 : CompoundStatement { | 780 | public class CompoundStatement_1 : CompoundStatement { |
754 | public CompoundStatement_1(Parser yyq):base(yyq){}} | 781 | public CompoundStatement_1(Parser yyq):base(yyq){}} |
755 | 782 | ||
756 | public class CompoundStatement_2 : CompoundStatement { | 783 | public class CompoundStatement_2 : CompoundStatement { |
757 | public CompoundStatement_2(Parser yyq):base(yyq, | 784 | public CompoundStatement_2(Parser yyq):base(yyq, |
758 | ((StatementList)(yyq.StackAt(1).m_value)) | 785 | ((StatementList)(yyq.StackAt(1).m_value)) |
759 | ){}} | 786 | ){}} |
760 | 787 | ||
761 | public class StatementList_1 : StatementList { | 788 | public class StatementList_1 : StatementList { |
762 | public StatementList_1(Parser yyq):base(yyq, | 789 | public StatementList_1(Parser yyq):base(yyq, |
763 | ((Statement)(yyq.StackAt(0).m_value)) | 790 | ((Statement)(yyq.StackAt(0).m_value)) |
764 | ){}} | 791 | ){}} |
765 | 792 | ||
766 | public class StatementList_2 : StatementList { | 793 | public class StatementList_2 : StatementList { |
767 | public StatementList_2(Parser yyq):base(yyq, | 794 | public StatementList_2(Parser yyq):base(yyq, |
768 | ((StatementList)(yyq.StackAt(1).m_value)) | 795 | ((StatementList)(yyq.StackAt(1).m_value)) |
769 | , | 796 | , |
770 | ((Statement)(yyq.StackAt(0).m_value)) | 797 | ((Statement)(yyq.StackAt(0).m_value)) |
771 | ){}} | 798 | ){}} |
772 | 799 | ||
773 | public class Statement_1 : Statement { | 800 | public class Statement_1 : Statement { |
774 | public Statement_1(Parser yyq):base(yyq, | 801 | public Statement_1(Parser yyq):base(yyq, |
775 | ((Declaration)(yyq.StackAt(1).m_value)) | 802 | ((Declaration)(yyq.StackAt(1).m_value)) |
776 | ){}} | 803 | ){}} |
777 | 804 | ||
778 | public class Statement_2 : Statement { | 805 | public class Statement_2 : Statement { |
779 | public Statement_2(Parser yyq):base(yyq, | 806 | public Statement_2(Parser yyq):base(yyq, |
780 | ((Assignment)(yyq.StackAt(1).m_value)) | 807 | ((Assignment)(yyq.StackAt(1).m_value)) |
781 | ){}} | 808 | ){}} |
782 | 809 | ||
783 | public class Statement_3 : Statement { | 810 | public class Statement_3 : Statement { |
784 | public Statement_3(Parser yyq):base(yyq, | 811 | public Statement_3(Parser yyq):base(yyq, |
785 | ((Expression)(yyq.StackAt(1).m_value)) | 812 | ((Expression)(yyq.StackAt(1).m_value)) |
786 | ){}} | 813 | ){}} |
787 | 814 | ||
788 | public class Statement_4 : Statement { | 815 | public class Statement_4 : Statement { |
789 | public Statement_4(Parser yyq):base(yyq, | 816 | public Statement_4(Parser yyq):base(yyq, |
790 | ((ReturnStatement)(yyq.StackAt(1).m_value)) | 817 | ((ReturnStatement)(yyq.StackAt(1).m_value)) |
791 | ){}} | 818 | ){}} |
792 | 819 | ||
793 | public class Statement_5 : Statement { | 820 | public class Statement_5 : Statement { |
794 | public Statement_5(Parser yyq):base(yyq, | 821 | public Statement_5(Parser yyq):base(yyq, |
795 | ((StateChange)(yyq.StackAt(1).m_value)) | 822 | ((StateChange)(yyq.StackAt(1).m_value)) |
796 | ){}} | 823 | ){}} |
797 | 824 | ||
798 | public class Statement_6 : Statement { | 825 | public class Statement_6 : Statement { |
799 | public Statement_6(Parser yyq):base(yyq, | 826 | public Statement_6(Parser yyq):base(yyq, |
800 | ((IfStatement)(yyq.StackAt(0).m_value)) | 827 | ((IfStatement)(yyq.StackAt(0).m_value)) |
801 | ){}} | 828 | ){}} |
802 | 829 | ||
803 | public class Statement_7 : Statement { | 830 | public class Statement_7 : Statement { |
804 | public Statement_7(Parser yyq):base(yyq, | 831 | public Statement_7(Parser yyq):base(yyq, |
805 | ((WhileStatement)(yyq.StackAt(0).m_value)) | 832 | ((WhileStatement)(yyq.StackAt(0).m_value)) |
806 | ){}} | 833 | ){}} |
807 | 834 | ||
808 | public class Statement_8 : Statement { | 835 | public class Statement_8 : Statement { |
809 | public Statement_8(Parser yyq):base(yyq, | 836 | public Statement_8(Parser yyq):base(yyq, |
810 | ((DoWhileStatement)(yyq.StackAt(0).m_value)) | 837 | ((DoWhileStatement)(yyq.StackAt(0).m_value)) |
811 | ){}} | 838 | ){}} |
812 | 839 | ||
813 | public class Statement_9 : Statement { | 840 | public class Statement_9 : Statement { |
814 | public Statement_9(Parser yyq):base(yyq, | 841 | public Statement_9(Parser yyq):base(yyq, |
815 | ((ForLoop)(yyq.StackAt(0).m_value)) | 842 | ((ForLoop)(yyq.StackAt(0).m_value)) |
816 | ){}} | 843 | ){}} |
817 | 844 | ||
818 | public class Statement_10 : Statement { | 845 | public class Statement_10 : Statement { |
819 | public Statement_10(Parser yyq):base(yyq, | 846 | public Statement_10(Parser yyq):base(yyq, |
820 | ((CompoundStatement)(yyq.StackAt(0).m_value)) | 847 | ((CompoundStatement)(yyq.StackAt(0).m_value)) |
821 | ){}} | 848 | ){}} |
822 | 849 | ||
823 | public class StateChange_1 : StateChange { | 850 | public class StateChange_1 : StateChange { |
824 | public StateChange_1(Parser yyq):base(yyq, | 851 | public StateChange_1(Parser yyq):base(yyq, |
825 | ((IDENT)(yyq.StackAt(0).m_value)) | 852 | ((IDENT)(yyq.StackAt(0).m_value)) |
826 | .yytext){}} | 853 | .yytext){}} |
827 | 854 | ||
828 | public class StateChange_2 : StateChange { | 855 | public class StateChange_2 : StateChange { |
829 | public StateChange_2(Parser yyq):base(yyq, | 856 | public StateChange_2(Parser yyq):base(yyq, |
830 | ((DEFAULT_STATE)(yyq.StackAt(0).m_value)) | 857 | ((DEFAULT_STATE)(yyq.StackAt(0).m_value)) |
831 | .yytext){}} | 858 | .yytext){}} |
832 | 859 | ||
833 | public class IfStatement_1 : IfStatement { | 860 | public class IfStatement_1 : IfStatement { |
834 | public IfStatement_1(Parser yyq):base(yyq, | 861 | public IfStatement_1(Parser yyq):base(yyq, |
835 | ((Expression)(yyq.StackAt(2).m_value)) | 862 | ((Expression)(yyq.StackAt(2).m_value)) |
836 | , | 863 | , |
837 | ((Statement)(yyq.StackAt(0).m_value)) | 864 | ((Statement)(yyq.StackAt(0).m_value)) |
838 | ){}} | 865 | ){}} |
839 | 866 | ||
840 | public class IfStatement_2 : IfStatement { | 867 | public class IfStatement_2 : IfStatement { |
841 | public IfStatement_2(Parser yyq):base(yyq, | 868 | public IfStatement_2(Parser yyq):base(yyq, |
842 | ((Expression)(yyq.StackAt(4).m_value)) | 869 | ((Expression)(yyq.StackAt(4).m_value)) |
843 | , | 870 | , |
844 | ((Statement)(yyq.StackAt(2).m_value)) | 871 | ((Statement)(yyq.StackAt(2).m_value)) |
845 | , | 872 | , |
846 | ((Statement)(yyq.StackAt(0).m_value)) | 873 | ((Statement)(yyq.StackAt(0).m_value)) |
847 | ){}} | 874 | ){}} |
848 | 875 | ||
849 | public class WhileStatement_1 : WhileStatement { | 876 | public class WhileStatement_1 : WhileStatement { |
850 | public WhileStatement_1(Parser yyq):base(yyq, | 877 | public WhileStatement_1(Parser yyq):base(yyq, |
851 | ((Expression)(yyq.StackAt(2).m_value)) | 878 | ((Expression)(yyq.StackAt(2).m_value)) |
852 | , | 879 | , |
853 | ((Statement)(yyq.StackAt(0).m_value)) | 880 | ((Statement)(yyq.StackAt(0).m_value)) |
854 | ){}} | 881 | ){}} |
855 | 882 | ||
856 | public class DoWhileStatement_1 : DoWhileStatement { | 883 | public class DoWhileStatement_1 : DoWhileStatement { |
857 | public DoWhileStatement_1(Parser yyq):base(yyq, | 884 | public DoWhileStatement_1(Parser yyq):base(yyq, |
858 | ((Expression)(yyq.StackAt(2).m_value)) | 885 | ((Expression)(yyq.StackAt(2).m_value)) |
859 | , | 886 | , |
860 | ((Statement)(yyq.StackAt(5).m_value)) | 887 | ((Statement)(yyq.StackAt(5).m_value)) |
861 | ){}} | 888 | ){}} |
862 | 889 | ||
863 | public class ForLoop_1 : ForLoop { | 890 | public class ForLoop_1 : ForLoop { |
864 | public ForLoop_1(Parser yyq):base(yyq, | 891 | public ForLoop_1(Parser yyq):base(yyq, |
865 | ((ForLoopStatement)(yyq.StackAt(6).m_value)) | 892 | ((ForLoopStatement)(yyq.StackAt(6).m_value)) |
866 | , | 893 | , |
867 | ((Expression)(yyq.StackAt(4).m_value)) | 894 | ((Expression)(yyq.StackAt(4).m_value)) |
868 | , | 895 | , |
869 | ((ForLoopStatement)(yyq.StackAt(2).m_value)) | 896 | ((ForLoopStatement)(yyq.StackAt(2).m_value)) |
870 | , | 897 | , |
871 | ((Statement)(yyq.StackAt(0).m_value)) | 898 | ((Statement)(yyq.StackAt(0).m_value)) |
872 | ){}} | 899 | ){}} |
873 | 900 | ||
874 | public class ForLoopStatement_1 : ForLoopStatement { | 901 | public class ForLoopStatement_1 : ForLoopStatement { |
875 | public ForLoopStatement_1(Parser yyq):base(yyq, | 902 | public ForLoopStatement_1(Parser yyq):base(yyq, |
876 | ((Expression)(yyq.StackAt(0).m_value)) | 903 | ((Expression)(yyq.StackAt(0).m_value)) |
877 | ){}} | 904 | ){}} |
878 | 905 | ||
879 | public class ForLoopStatement_2 : ForLoopStatement { | 906 | public class ForLoopStatement_2 : ForLoopStatement { |
880 | public ForLoopStatement_2(Parser yyq):base(yyq, | 907 | public ForLoopStatement_2(Parser yyq):base(yyq, |
881 | ((Assignment)(yyq.StackAt(0).m_value)) | 908 | ((Assignment)(yyq.StackAt(0).m_value)) |
882 | ){}} | 909 | ){}} |
883 | 910 | ||
884 | public class ForLoopStatement_3 : ForLoopStatement { | 911 | public class ForLoopStatement_3 : ForLoopStatement { |
885 | public ForLoopStatement_3(Parser yyq):base(yyq, | 912 | public ForLoopStatement_3(Parser yyq):base(yyq, |
886 | ((ForLoopStatement)(yyq.StackAt(2).m_value)) | 913 | ((ForLoopStatement)(yyq.StackAt(2).m_value)) |
887 | , | 914 | , |
888 | ((Expression)(yyq.StackAt(0).m_value)) | 915 | ((Expression)(yyq.StackAt(0).m_value)) |
889 | ){}} | 916 | ){}} |
890 | 917 | ||
891 | public class ForLoopStatement_4 : ForLoopStatement { | 918 | public class ForLoopStatement_4 : ForLoopStatement { |
892 | public ForLoopStatement_4(Parser yyq):base(yyq, | 919 | public ForLoopStatement_4(Parser yyq):base(yyq, |
893 | ((ForLoopStatement)(yyq.StackAt(2).m_value)) | 920 | ((ForLoopStatement)(yyq.StackAt(2).m_value)) |
894 | , | 921 | , |
895 | ((Assignment)(yyq.StackAt(0).m_value)) | 922 | ((Assignment)(yyq.StackAt(0).m_value)) |
896 | ){}} | 923 | ){}} |
897 | 924 | ||
898 | public class Assignment_1 : Assignment { | 925 | public class Assignment_1 : Assignment { |
899 | public Assignment_1(Parser yyq):base(yyq, | 926 | public Assignment_1(Parser yyq):base(yyq, |
900 | ((Declaration)(yyq.StackAt(2).m_value)) | 927 | ((Declaration)(yyq.StackAt(2).m_value)) |
901 | , | 928 | , |
902 | ((Expression)(yyq.StackAt(0).m_value)) | 929 | ((Expression)(yyq.StackAt(0).m_value)) |
903 | , | 930 | , |
904 | ((EQUALS)(yyq.StackAt(1).m_value)) | 931 | ((EQUALS)(yyq.StackAt(1).m_value)) |
905 | .yytext){}} | 932 | .yytext){}} |
906 | 933 | ||
907 | public class Assignment_2 : Assignment { | 934 | public class Assignment_2 : Assignment { |
908 | public Assignment_2(Parser yyq):base(yyq, | 935 | public Assignment_2(Parser yyq):base(yyq, |
909 | ((IDENT)(yyq.StackAt(2).m_value)) | 936 | ((IDENT)(yyq.StackAt(2).m_value)) |
910 | , | 937 | , |
911 | ((Expression)(yyq.StackAt(0).m_value)) | 938 | ((Expression)(yyq.StackAt(0).m_value)) |
912 | , | 939 | , |
913 | ((EQUALS)(yyq.StackAt(1).m_value)) | 940 | ((EQUALS)(yyq.StackAt(1).m_value)) |
914 | .yytext){}} | 941 | .yytext){}} |
915 | 942 | ||
916 | public class Assignment_3 : Assignment { | 943 | public class Assignment_3 : Assignment { |
917 | public Assignment_3(Parser yyq):base(yyq, | 944 | public Assignment_3(Parser yyq):base(yyq, |
918 | ((IDENT)(yyq.StackAt(2).m_value)) | 945 | ((IDENT)(yyq.StackAt(2).m_value)) |
919 | , | 946 | , |
920 | ((Expression)(yyq.StackAt(0).m_value)) | 947 | ((Expression)(yyq.StackAt(0).m_value)) |
921 | , | 948 | , |
922 | ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) | 949 | ((PLUS_EQUALS)(yyq.StackAt(1).m_value)) |
923 | .yytext){}} | 950 | .yytext){}} |
924 | 951 | ||
925 | public class Assignment_4 : Assignment { | 952 | public class Assignment_4 : Assignment { |
926 | public Assignment_4(Parser yyq):base(yyq, | 953 | public Assignment_4(Parser yyq):base(yyq, |
927 | ((IDENT)(yyq.StackAt(2).m_value)) | 954 | ((IDENT)(yyq.StackAt(2).m_value)) |
928 | , | 955 | , |
929 | ((Expression)(yyq.StackAt(0).m_value)) | 956 | ((Expression)(yyq.StackAt(0).m_value)) |
930 | , | 957 | , |
931 | ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) | 958 | ((MINUS_EQUALS)(yyq.StackAt(1).m_value)) |
932 | .yytext){}} | 959 | .yytext){}} |
933 | 960 | ||
934 | public class Assignment_5 : Assignment { | 961 | public class Assignment_5 : Assignment { |
935 | public Assignment_5(Parser yyq):base(yyq, | 962 | public Assignment_5(Parser yyq):base(yyq, |
936 | ((IDENT)(yyq.StackAt(2).m_value)) | 963 | ((IDENT)(yyq.StackAt(2).m_value)) |
937 | , | 964 | , |
938 | ((Expression)(yyq.StackAt(0).m_value)) | 965 | ((Expression)(yyq.StackAt(0).m_value)) |
939 | , | 966 | , |
940 | ((STAR_EQUALS)(yyq.StackAt(1).m_value)) | 967 | ((STAR_EQUALS)(yyq.StackAt(1).m_value)) |
941 | .yytext){}} | 968 | .yytext){}} |
942 | 969 | ||
943 | public class Assignment_6 : Assignment { | 970 | public class Assignment_6 : Assignment { |
944 | public Assignment_6(Parser yyq):base(yyq, | 971 | public Assignment_6(Parser yyq):base(yyq, |
945 | ((IDENT)(yyq.StackAt(2).m_value)) | 972 | ((IDENT)(yyq.StackAt(2).m_value)) |
946 | , | 973 | , |
947 | ((Expression)(yyq.StackAt(0).m_value)) | 974 | ((Expression)(yyq.StackAt(0).m_value)) |
948 | , | 975 | , |
949 | ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) | 976 | ((SLASH_EQUALS)(yyq.StackAt(1).m_value)) |
950 | .yytext){}} | 977 | .yytext){}} |
951 | 978 | ||
952 | public class Assignment_7 : Assignment { | 979 | public class Assignment_7 : Assignment { |
953 | public Assignment_7(Parser yyq):base(yyq, | 980 | public Assignment_7(Parser yyq):base(yyq, |
954 | ((IDENT)(yyq.StackAt(2).m_value)) | 981 | ((IDENT)(yyq.StackAt(2).m_value)) |
955 | , | 982 | , |
956 | ((Expression)(yyq.StackAt(0).m_value)) | 983 | ((Expression)(yyq.StackAt(0).m_value)) |
957 | , | 984 | , |
958 | ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) | 985 | ((PERCENT_EQUALS)(yyq.StackAt(1).m_value)) |
959 | .yytext){}} | 986 | .yytext){}} |
960 | 987 | ||
961 | public class Assignment_8 : Assignment { | 988 | public class Assignment_8 : Assignment { |
962 | public Assignment_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax | 989 | public Assignment_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax |
963 | )yyq), | 990 | )yyq), |
964 | ((IDENT)(yyq.StackAt(4).m_value)) | 991 | ((IDENT)(yyq.StackAt(4).m_value)) |
965 | .yytext, | 992 | .yytext, |
966 | ((IDENT)(yyq.StackAt(2).m_value)) | 993 | ((IDENT)(yyq.StackAt(2).m_value)) |
967 | .yytext), | 994 | .yytext), |
968 | ((Expression)(yyq.StackAt(0).m_value)) | 995 | ((Expression)(yyq.StackAt(0).m_value)) |
969 | , | 996 | , |
970 | ((EQUALS)(yyq.StackAt(1).m_value)) | 997 | ((EQUALS)(yyq.StackAt(1).m_value)) |
971 | .yytext){}} | 998 | .yytext){}} |
972 | 999 | ||
973 | public class ReturnStatement_1 : ReturnStatement { | 1000 | public class ReturnStatement_1 : ReturnStatement { |
974 | public ReturnStatement_1(Parser yyq):base(yyq, | 1001 | public ReturnStatement_1(Parser yyq):base(yyq, |
975 | ((Expression)(yyq.StackAt(0).m_value)) | 1002 | ((Expression)(yyq.StackAt(0).m_value)) |
976 | ){}} | 1003 | ){}} |
977 | 1004 | ||
978 | public class ReturnStatement_2 : ReturnStatement { | 1005 | public class ReturnStatement_2 : ReturnStatement { |
979 | public ReturnStatement_2(Parser yyq):base(yyq){}} | 1006 | public ReturnStatement_2(Parser yyq):base(yyq){}} |
980 | 1007 | ||
981 | public class Constant_1 : Constant { | 1008 | public class Constant_1 : Constant { |
982 | public Constant_1(Parser yyq):base(yyq,"integer", | 1009 | public Constant_1(Parser yyq):base(yyq,"integer", |
983 | ((INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) | 1010 | ((INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) |
984 | .yytext){}} | 1011 | .yytext){}} |
985 | 1012 | ||
986 | public class Constant_2 : Constant { | 1013 | public class Constant_2 : Constant { |
987 | public Constant_2(Parser yyq):base(yyq,"integer", | 1014 | public Constant_2(Parser yyq):base(yyq,"integer", |
988 | ((HEX_INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) | 1015 | ((HEX_INTEGER_CONSTANT)(yyq.StackAt(0).m_value)) |
989 | .yytext){}} | 1016 | .yytext){}} |
990 | 1017 | ||
991 | public class Constant_3 : Constant { | 1018 | public class Constant_3 : Constant { |
992 | public Constant_3(Parser yyq):base(yyq,"float", | 1019 | public Constant_3(Parser yyq):base(yyq,"float", |
993 | ((FLOAT_CONSTANT)(yyq.StackAt(0).m_value)) | 1020 | ((FLOAT_CONSTANT)(yyq.StackAt(0).m_value)) |
994 | .yytext){}} | 1021 | .yytext){}} |
995 | 1022 | ||
996 | public class Constant_4 : Constant { | 1023 | public class Constant_4 : Constant { |
997 | public Constant_4(Parser yyq):base(yyq,"string", | 1024 | public Constant_4(Parser yyq):base(yyq,"string", |
998 | ((STRING_CONSTANT)(yyq.StackAt(0).m_value)) | 1025 | ((STRING_CONSTANT)(yyq.StackAt(0).m_value)) |
999 | .yytext){}} | 1026 | .yytext){}} |
1000 | 1027 | ||
1001 | public class VectorConstant_1 : VectorConstant { | 1028 | public class VectorConstant_1 : VectorConstant { |
1002 | public VectorConstant_1(Parser yyq):base(yyq, | 1029 | public VectorConstant_1(Parser yyq):base(yyq, |
1003 | ((Expression)(yyq.StackAt(5).m_value)) | 1030 | ((Expression)(yyq.StackAt(5).m_value)) |
1004 | , | 1031 | , |
1005 | ((Expression)(yyq.StackAt(3).m_value)) | 1032 | ((Expression)(yyq.StackAt(3).m_value)) |
1006 | , | 1033 | , |
1007 | ((Expression)(yyq.StackAt(1).m_value)) | 1034 | ((Expression)(yyq.StackAt(1).m_value)) |
1008 | ){}} | 1035 | ){}} |
1009 | 1036 | ||
1010 | public class RotationConstant_1 : RotationConstant { | 1037 | public class RotationConstant_1 : RotationConstant { |
1011 | public RotationConstant_1(Parser yyq):base(yyq, | 1038 | public RotationConstant_1(Parser yyq):base(yyq, |
1012 | ((Expression)(yyq.StackAt(7).m_value)) | 1039 | ((Expression)(yyq.StackAt(7).m_value)) |
1013 | , | 1040 | , |
1014 | ((Expression)(yyq.StackAt(5).m_value)) | 1041 | ((Expression)(yyq.StackAt(5).m_value)) |
1015 | , | 1042 | , |
1016 | ((Expression)(yyq.StackAt(3).m_value)) | 1043 | ((Expression)(yyq.StackAt(3).m_value)) |
1017 | , | 1044 | , |
1018 | ((Expression)(yyq.StackAt(1).m_value)) | 1045 | ((Expression)(yyq.StackAt(1).m_value)) |
1019 | ){}} | 1046 | ){}} |
1020 | 1047 | ||
1021 | public class ListConstant_1 : ListConstant { | 1048 | public class ListConstant_1 : ListConstant { |
1022 | public ListConstant_1(Parser yyq):base(yyq, | 1049 | public ListConstant_1(Parser yyq):base(yyq, |
1023 | ((ArgumentList)(yyq.StackAt(1).m_value)) | 1050 | ((ArgumentList)(yyq.StackAt(1).m_value)) |
1024 | ){}} | 1051 | ){}} |
1025 | 1052 | ||
1026 | public class ConstantExpression_1 : ConstantExpression { | 1053 | public class ConstantExpression_1 : ConstantExpression { |
1027 | public ConstantExpression_1(Parser yyq):base(yyq, | 1054 | public ConstantExpression_1(Parser yyq):base(yyq, |
1028 | ((Constant)(yyq.StackAt(0).m_value)) | 1055 | ((Constant)(yyq.StackAt(0).m_value)) |
1029 | ){}} | 1056 | ){}} |
1030 | 1057 | ||
1031 | public class IdentExpression_1 : IdentExpression { | 1058 | public class IdentExpression_1 : IdentExpression { |
1032 | public IdentExpression_1(Parser yyq):base(yyq, | 1059 | public IdentExpression_1(Parser yyq):base(yyq, |
1033 | ((IDENT)(yyq.StackAt(0).m_value)) | 1060 | ((IDENT)(yyq.StackAt(0).m_value)) |
1034 | .yytext){}} | 1061 | .yytext){}} |
1035 | 1062 | ||
1036 | public class IdentDotExpression_1 : IdentDotExpression { | 1063 | public class IdentDotExpression_1 : IdentDotExpression { |
1037 | public IdentDotExpression_1(Parser yyq):base(yyq, | 1064 | public IdentDotExpression_1(Parser yyq):base(yyq, |
1038 | ((IDENT)(yyq.StackAt(2).m_value)) | 1065 | ((IDENT)(yyq.StackAt(2).m_value)) |
1039 | .yytext, | 1066 | .yytext, |
1040 | ((IDENT)(yyq.StackAt(0).m_value)) | 1067 | ((IDENT)(yyq.StackAt(0).m_value)) |
1041 | .yytext){}} | 1068 | .yytext){}} |
1042 | 1069 | ||
1043 | public class IncrementDecrementExpression_1 : IncrementDecrementExpression { | 1070 | public class IncrementDecrementExpression_1 : IncrementDecrementExpression { |
1044 | public IncrementDecrementExpression_1(Parser yyq):base(yyq, | 1071 | public IncrementDecrementExpression_1(Parser yyq):base(yyq, |
1045 | ((IDENT)(yyq.StackAt(1).m_value)) | 1072 | ((IDENT)(yyq.StackAt(1).m_value)) |
1046 | .yytext, | 1073 | .yytext, |
1047 | ((INCREMENT)(yyq.StackAt(0).m_value)) | 1074 | ((INCREMENT)(yyq.StackAt(0).m_value)) |
1048 | .yytext, true){}} | 1075 | .yytext, true){}} |
1049 | 1076 | ||
1050 | public class IncrementDecrementExpression_2 : IncrementDecrementExpression { | 1077 | public class IncrementDecrementExpression_2 : IncrementDecrementExpression { |
1051 | public IncrementDecrementExpression_2(Parser yyq):base(yyq, | 1078 | public IncrementDecrementExpression_2(Parser yyq):base(yyq, |
1052 | ((IDENT)(yyq.StackAt(1).m_value)) | 1079 | ((IDENT)(yyq.StackAt(1).m_value)) |
1053 | .yytext, | 1080 | .yytext, |
1054 | ((DECREMENT)(yyq.StackAt(0).m_value)) | 1081 | ((DECREMENT)(yyq.StackAt(0).m_value)) |
1055 | .yytext, true){}} | 1082 | .yytext, true){}} |
1056 | 1083 | ||
1057 | public class IncrementDecrementExpression_3 : IncrementDecrementExpression { | 1084 | public class IncrementDecrementExpression_3 : IncrementDecrementExpression { |
1058 | public IncrementDecrementExpression_3(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax | 1085 | public IncrementDecrementExpression_3(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax |
1059 | )yyq), | 1086 | )yyq), |
1060 | ((IDENT)(yyq.StackAt(3).m_value)) | 1087 | ((IDENT)(yyq.StackAt(3).m_value)) |
1061 | .yytext, | 1088 | .yytext, |
1062 | ((IDENT)(yyq.StackAt(1).m_value)) | 1089 | ((IDENT)(yyq.StackAt(1).m_value)) |
1063 | .yytext), | 1090 | .yytext), |
1064 | ((INCREMENT)(yyq.StackAt(0).m_value)) | 1091 | ((INCREMENT)(yyq.StackAt(0).m_value)) |
1065 | .yytext, true){}} | 1092 | .yytext, true){}} |
1066 | 1093 | ||
1067 | public class IncrementDecrementExpression_4 : IncrementDecrementExpression { | 1094 | public class IncrementDecrementExpression_4 : IncrementDecrementExpression { |
1068 | public IncrementDecrementExpression_4(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax | 1095 | public IncrementDecrementExpression_4(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax |
1069 | )yyq), | 1096 | )yyq), |
1070 | ((IDENT)(yyq.StackAt(3).m_value)) | 1097 | ((IDENT)(yyq.StackAt(3).m_value)) |
1071 | .yytext, | 1098 | .yytext, |
1072 | ((IDENT)(yyq.StackAt(1).m_value)) | 1099 | ((IDENT)(yyq.StackAt(1).m_value)) |
1073 | .yytext), | 1100 | .yytext), |
1074 | ((DECREMENT)(yyq.StackAt(0).m_value)) | 1101 | ((DECREMENT)(yyq.StackAt(0).m_value)) |
1075 | .yytext, true){}} | 1102 | .yytext, true){}} |
1076 | 1103 | ||
1077 | public class IncrementDecrementExpression_5 : IncrementDecrementExpression { | 1104 | public class IncrementDecrementExpression_5 : IncrementDecrementExpression { |
1078 | public IncrementDecrementExpression_5(Parser yyq):base(yyq, | 1105 | public IncrementDecrementExpression_5(Parser yyq):base(yyq, |
1079 | ((IDENT)(yyq.StackAt(0).m_value)) | 1106 | ((IDENT)(yyq.StackAt(0).m_value)) |
1080 | .yytext, | 1107 | .yytext, |
1081 | ((INCREMENT)(yyq.StackAt(1).m_value)) | 1108 | ((INCREMENT)(yyq.StackAt(1).m_value)) |
1082 | .yytext, false){}} | 1109 | .yytext, false){}} |
1083 | 1110 | ||
1084 | public class IncrementDecrementExpression_6 : IncrementDecrementExpression { | 1111 | public class IncrementDecrementExpression_6 : IncrementDecrementExpression { |
1085 | public IncrementDecrementExpression_6(Parser yyq):base(yyq, | 1112 | public IncrementDecrementExpression_6(Parser yyq):base(yyq, |
1086 | ((IDENT)(yyq.StackAt(0).m_value)) | 1113 | ((IDENT)(yyq.StackAt(0).m_value)) |
1087 | .yytext, | 1114 | .yytext, |
1088 | ((DECREMENT)(yyq.StackAt(1).m_value)) | 1115 | ((DECREMENT)(yyq.StackAt(1).m_value)) |
1089 | .yytext, false){}} | 1116 | .yytext, false){}} |
1090 | 1117 | ||
1091 | public class IncrementDecrementExpression_7 : IncrementDecrementExpression { | 1118 | public class IncrementDecrementExpression_7 : IncrementDecrementExpression { |
1092 | public IncrementDecrementExpression_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax | 1119 | public IncrementDecrementExpression_7(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax |
1093 | )yyq), | 1120 | )yyq), |
1094 | ((IDENT)(yyq.StackAt(2).m_value)) | 1121 | ((IDENT)(yyq.StackAt(2).m_value)) |
1095 | .yytext, | 1122 | .yytext, |
1096 | ((IDENT)(yyq.StackAt(0).m_value)) | 1123 | ((IDENT)(yyq.StackAt(0).m_value)) |
1097 | .yytext), | 1124 | .yytext), |
1098 | ((INCREMENT)(yyq.StackAt(3).m_value)) | 1125 | ((INCREMENT)(yyq.StackAt(3).m_value)) |
1099 | .yytext, false){}} | 1126 | .yytext, false){}} |
1100 | 1127 | ||
1101 | public class IncrementDecrementExpression_8 : IncrementDecrementExpression { | 1128 | public class IncrementDecrementExpression_8 : IncrementDecrementExpression { |
1102 | public IncrementDecrementExpression_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax | 1129 | public IncrementDecrementExpression_8(Parser yyq):base(yyq,new IdentDotExpression(((LSLSyntax |
1103 | )yyq), | 1130 | )yyq), |
1104 | ((IDENT)(yyq.StackAt(2).m_value)) | 1131 | ((IDENT)(yyq.StackAt(2).m_value)) |
1105 | .yytext, | 1132 | .yytext, |
1106 | ((IDENT)(yyq.StackAt(0).m_value)) | 1133 | ((IDENT)(yyq.StackAt(0).m_value)) |
1107 | .yytext), | 1134 | .yytext), |
1108 | ((DECREMENT)(yyq.StackAt(3).m_value)) | 1135 | ((DECREMENT)(yyq.StackAt(3).m_value)) |
1109 | .yytext, false){}} | 1136 | .yytext, false){}} |
1110 | 1137 | ||
1111 | public class FunctionCallExpression_1 : FunctionCallExpression { | 1138 | public class FunctionCallExpression_1 : FunctionCallExpression { |
1112 | public FunctionCallExpression_1(Parser yyq):base(yyq, | 1139 | public FunctionCallExpression_1(Parser yyq):base(yyq, |
1113 | ((FunctionCall)(yyq.StackAt(0).m_value)) | 1140 | ((FunctionCall)(yyq.StackAt(0).m_value)) |
1114 | ){}} | 1141 | ){}} |
1115 | 1142 | ||
1116 | public class BinaryExpression_1 : BinaryExpression { | 1143 | public class BinaryExpression_1 : BinaryExpression { |
1117 | public BinaryExpression_1(Parser yyq):base(yyq, | 1144 | public BinaryExpression_1(Parser yyq):base(yyq, |
1118 | ((Expression)(yyq.StackAt(2).m_value)) | 1145 | ((Expression)(yyq.StackAt(2).m_value)) |
1119 | , | 1146 | , |
1120 | ((Expression)(yyq.StackAt(0).m_value)) | 1147 | ((Expression)(yyq.StackAt(0).m_value)) |
1121 | , | 1148 | , |
1122 | ((PLUS)(yyq.StackAt(1).m_value)) | 1149 | ((PLUS)(yyq.StackAt(1).m_value)) |
1123 | .yytext){}} | 1150 | .yytext){}} |
1124 | 1151 | ||
1125 | public class BinaryExpression_2 : BinaryExpression { | 1152 | public class BinaryExpression_2 : BinaryExpression { |
1126 | public BinaryExpression_2(Parser yyq):base(yyq, | 1153 | public BinaryExpression_2(Parser yyq):base(yyq, |
1127 | ((Expression)(yyq.StackAt(2).m_value)) | 1154 | ((Expression)(yyq.StackAt(2).m_value)) |
1128 | , | 1155 | , |
1129 | ((Expression)(yyq.StackAt(0).m_value)) | 1156 | ((Expression)(yyq.StackAt(0).m_value)) |
1130 | , | 1157 | , |
1131 | ((MINUS)(yyq.StackAt(1).m_value)) | 1158 | ((MINUS)(yyq.StackAt(1).m_value)) |
1132 | .yytext){}} | 1159 | .yytext){}} |
1133 | 1160 | ||
1134 | public class BinaryExpression_3 : BinaryExpression { | 1161 | public class BinaryExpression_3 : BinaryExpression { |
1135 | public BinaryExpression_3(Parser yyq):base(yyq, | 1162 | public BinaryExpression_3(Parser yyq):base(yyq, |
1136 | ((Expression)(yyq.StackAt(2).m_value)) | 1163 | ((Expression)(yyq.StackAt(2).m_value)) |
1137 | , | 1164 | , |
1138 | ((Expression)(yyq.StackAt(0).m_value)) | 1165 | ((Expression)(yyq.StackAt(0).m_value)) |
1139 | , | 1166 | , |
1140 | ((STAR)(yyq.StackAt(1).m_value)) | 1167 | ((STAR)(yyq.StackAt(1).m_value)) |
1141 | .yytext){}} | 1168 | .yytext){}} |
1142 | 1169 | ||
1143 | public class BinaryExpression_4 : BinaryExpression { | 1170 | public class BinaryExpression_4 : BinaryExpression { |
1144 | public BinaryExpression_4(Parser yyq):base(yyq, | 1171 | public BinaryExpression_4(Parser yyq):base(yyq, |
1145 | ((Expression)(yyq.StackAt(2).m_value)) | 1172 | ((Expression)(yyq.StackAt(2).m_value)) |
1146 | , | 1173 | , |
1147 | ((Expression)(yyq.StackAt(0).m_value)) | 1174 | ((Expression)(yyq.StackAt(0).m_value)) |
1148 | , | 1175 | , |
1149 | ((SLASH)(yyq.StackAt(1).m_value)) | 1176 | ((SLASH)(yyq.StackAt(1).m_value)) |
1150 | .yytext){}} | 1177 | .yytext){}} |
1151 | 1178 | ||
1152 | public class BinaryExpression_5 : BinaryExpression { | 1179 | public class BinaryExpression_5 : BinaryExpression { |
1153 | public BinaryExpression_5(Parser yyq):base(yyq, | 1180 | public BinaryExpression_5(Parser yyq):base(yyq, |
1154 | ((Expression)(yyq.StackAt(2).m_value)) | 1181 | ((Expression)(yyq.StackAt(2).m_value)) |
1155 | , | 1182 | , |
1156 | ((Expression)(yyq.StackAt(0).m_value)) | 1183 | ((Expression)(yyq.StackAt(0).m_value)) |
1157 | , | 1184 | , |
1158 | ((PERCENT)(yyq.StackAt(1).m_value)) | 1185 | ((PERCENT)(yyq.StackAt(1).m_value)) |
1159 | .yytext){}} | 1186 | .yytext){}} |
1160 | 1187 | ||
1161 | public class BinaryExpression_6 : BinaryExpression { | 1188 | public class BinaryExpression_6 : BinaryExpression { |
1162 | public BinaryExpression_6(Parser yyq):base(yyq, | 1189 | public BinaryExpression_6(Parser yyq):base(yyq, |
1163 | ((Expression)(yyq.StackAt(2).m_value)) | 1190 | ((Expression)(yyq.StackAt(2).m_value)) |
1164 | , | 1191 | , |
1165 | ((Expression)(yyq.StackAt(0).m_value)) | 1192 | ((Expression)(yyq.StackAt(0).m_value)) |
1166 | , | 1193 | , |
1167 | ((AMP)(yyq.StackAt(1).m_value)) | 1194 | ((AMP)(yyq.StackAt(1).m_value)) |
1168 | .yytext){}} | 1195 | .yytext){}} |
1169 | 1196 | ||
1170 | public class BinaryExpression_7 : BinaryExpression { | 1197 | public class BinaryExpression_7 : BinaryExpression { |
1171 | public BinaryExpression_7(Parser yyq):base(yyq, | 1198 | public BinaryExpression_7(Parser yyq):base(yyq, |
1172 | ((Expression)(yyq.StackAt(2).m_value)) | 1199 | ((Expression)(yyq.StackAt(2).m_value)) |
1173 | , | 1200 | , |
1174 | ((Expression)(yyq.StackAt(0).m_value)) | 1201 | ((Expression)(yyq.StackAt(0).m_value)) |
1175 | , | 1202 | , |
1176 | ((STROKE)(yyq.StackAt(1).m_value)) | 1203 | ((STROKE)(yyq.StackAt(1).m_value)) |
1177 | .yytext){}} | 1204 | .yytext){}} |
1178 | 1205 | ||
1179 | public class BinaryExpression_8 : BinaryExpression { | 1206 | public class BinaryExpression_8 : BinaryExpression { |
1180 | public BinaryExpression_8(Parser yyq):base(yyq, | 1207 | public BinaryExpression_8(Parser yyq):base(yyq, |
1181 | ((Expression)(yyq.StackAt(2).m_value)) | 1208 | ((Expression)(yyq.StackAt(2).m_value)) |
1182 | , | 1209 | , |
1183 | ((Expression)(yyq.StackAt(0).m_value)) | 1210 | ((Expression)(yyq.StackAt(0).m_value)) |
1184 | , | 1211 | , |
1185 | ((CARET)(yyq.StackAt(1).m_value)) | 1212 | ((CARET)(yyq.StackAt(1).m_value)) |
1186 | .yytext){}} | 1213 | .yytext){}} |
1187 | 1214 | ||
1188 | public class BinaryExpression_9 : BinaryExpression { | 1215 | public class BinaryExpression_9 : BinaryExpression { |
1189 | public BinaryExpression_9(Parser yyq):base(yyq, | 1216 | public BinaryExpression_9(Parser yyq):base(yyq, |
1190 | ((Expression)(yyq.StackAt(2).m_value)) | 1217 | ((Expression)(yyq.StackAt(2).m_value)) |
1191 | , | 1218 | , |
1192 | ((Expression)(yyq.StackAt(0).m_value)) | 1219 | ((Expression)(yyq.StackAt(0).m_value)) |
1193 | , | 1220 | , |
1194 | ((RIGHT_ANGLE)(yyq.StackAt(1).m_value)) | 1221 | ((RIGHT_ANGLE)(yyq.StackAt(1).m_value)) |
1195 | .yytext){}} | 1222 | .yytext){}} |
1196 | 1223 | ||
1197 | public class BinaryExpression_10 : BinaryExpression { | 1224 | public class BinaryExpression_10 : BinaryExpression { |
1198 | public BinaryExpression_10(Parser yyq):base(yyq, | 1225 | public BinaryExpression_10(Parser yyq):base(yyq, |
1199 | ((Expression)(yyq.StackAt(2).m_value)) | 1226 | ((Expression)(yyq.StackAt(2).m_value)) |
1200 | , | 1227 | , |
1201 | ((Expression)(yyq.StackAt(0).m_value)) | 1228 | ((Expression)(yyq.StackAt(0).m_value)) |
1202 | , | 1229 | , |
1203 | ((LEFT_ANGLE)(yyq.StackAt(1).m_value)) | 1230 | ((LEFT_ANGLE)(yyq.StackAt(1).m_value)) |
1204 | .yytext){}} | 1231 | .yytext){}} |
1205 | 1232 | ||
1206 | public class BinaryExpression_11 : BinaryExpression { | 1233 | public class BinaryExpression_11 : BinaryExpression { |
1207 | public BinaryExpression_11(Parser yyq):base(yyq, | 1234 | public BinaryExpression_11(Parser yyq):base(yyq, |
1208 | ((Expression)(yyq.StackAt(2).m_value)) | 1235 | ((Expression)(yyq.StackAt(2).m_value)) |
1209 | , | 1236 | , |
1210 | ((Expression)(yyq.StackAt(0).m_value)) | 1237 | ((Expression)(yyq.StackAt(0).m_value)) |
1211 | , | 1238 | , |
1212 | ((EQUALS_EQUALS)(yyq.StackAt(1).m_value)) | 1239 | ((EQUALS_EQUALS)(yyq.StackAt(1).m_value)) |
1213 | .yytext){}} | 1240 | .yytext){}} |
1214 | 1241 | ||
1215 | public class BinaryExpression_12 : BinaryExpression { | 1242 | public class BinaryExpression_12 : BinaryExpression { |
1216 | public BinaryExpression_12(Parser yyq):base(yyq, | 1243 | public BinaryExpression_12(Parser yyq):base(yyq, |
1217 | ((Expression)(yyq.StackAt(2).m_value)) | 1244 | ((Expression)(yyq.StackAt(2).m_value)) |
1218 | , | 1245 | , |
1219 | ((Expression)(yyq.StackAt(0).m_value)) | 1246 | ((Expression)(yyq.StackAt(0).m_value)) |
1220 | , | 1247 | , |
1221 | ((EXCLAMATION_EQUALS)(yyq.StackAt(1).m_value)) | 1248 | ((EXCLAMATION_EQUALS)(yyq.StackAt(1).m_value)) |
1222 | .yytext){}} | 1249 | .yytext){}} |
1223 | 1250 | ||
1224 | public class BinaryExpression_13 : BinaryExpression { | 1251 | public class BinaryExpression_13 : BinaryExpression { |
1225 | public BinaryExpression_13(Parser yyq):base(yyq, | 1252 | public BinaryExpression_13(Parser yyq):base(yyq, |
1226 | ((Expression)(yyq.StackAt(2).m_value)) | 1253 | ((Expression)(yyq.StackAt(2).m_value)) |
1227 | , | 1254 | , |
1228 | ((Expression)(yyq.StackAt(0).m_value)) | 1255 | ((Expression)(yyq.StackAt(0).m_value)) |
1229 | , | 1256 | , |
1230 | ((LESS_EQUALS)(yyq.StackAt(1).m_value)) | 1257 | ((LESS_EQUALS)(yyq.StackAt(1).m_value)) |
1231 | .yytext){}} | 1258 | .yytext){}} |
1232 | 1259 | ||
1233 | public class BinaryExpression_14 : BinaryExpression { | 1260 | public class BinaryExpression_14 : BinaryExpression { |
1234 | public BinaryExpression_14(Parser yyq):base(yyq, | 1261 | public BinaryExpression_14(Parser yyq):base(yyq, |
1235 | ((Expression)(yyq.StackAt(2).m_value)) | 1262 | ((Expression)(yyq.StackAt(2).m_value)) |
1236 | , | 1263 | , |
1237 | ((Expression)(yyq.StackAt(0).m_value)) | 1264 | ((Expression)(yyq.StackAt(0).m_value)) |
1238 | , | 1265 | , |
1239 | ((GREATER_EQUALS)(yyq.StackAt(1).m_value)) | 1266 | ((GREATER_EQUALS)(yyq.StackAt(1).m_value)) |
1240 | .yytext){}} | 1267 | .yytext){}} |
1241 | 1268 | ||
1242 | public class BinaryExpression_15 : BinaryExpression { | 1269 | public class BinaryExpression_15 : BinaryExpression { |
1243 | public BinaryExpression_15(Parser yyq):base(yyq, | 1270 | public BinaryExpression_15(Parser yyq):base(yyq, |
1244 | ((Expression)(yyq.StackAt(2).m_value)) | 1271 | ((Expression)(yyq.StackAt(2).m_value)) |
1245 | , | 1272 | , |
1246 | ((Expression)(yyq.StackAt(0).m_value)) | 1273 | ((Expression)(yyq.StackAt(0).m_value)) |
1247 | , | 1274 | , |
1248 | ((AMP_AMP)(yyq.StackAt(1).m_value)) | 1275 | ((AMP_AMP)(yyq.StackAt(1).m_value)) |
1249 | .yytext){}} | 1276 | .yytext){}} |
1250 | 1277 | ||
1251 | public class BinaryExpression_16 : BinaryExpression { | 1278 | public class BinaryExpression_16 : BinaryExpression { |
1252 | public BinaryExpression_16(Parser yyq):base(yyq, | 1279 | public BinaryExpression_16(Parser yyq):base(yyq, |
1253 | ((Expression)(yyq.StackAt(2).m_value)) | 1280 | ((Expression)(yyq.StackAt(2).m_value)) |
1254 | , | 1281 | , |
1255 | ((Expression)(yyq.StackAt(0).m_value)) | 1282 | ((Expression)(yyq.StackAt(0).m_value)) |
1256 | , | 1283 | , |
1257 | ((STROKE_STROKE)(yyq.StackAt(1).m_value)) | 1284 | ((STROKE_STROKE)(yyq.StackAt(1).m_value)) |
1258 | .yytext){}} | 1285 | .yytext){}} |
1259 | 1286 | ||
1260 | public class BinaryExpression_17 : BinaryExpression { | 1287 | public class BinaryExpression_17 : BinaryExpression { |
1261 | public BinaryExpression_17(Parser yyq):base(yyq, | 1288 | public BinaryExpression_17(Parser yyq):base(yyq, |
1262 | ((Expression)(yyq.StackAt(2).m_value)) | 1289 | ((Expression)(yyq.StackAt(2).m_value)) |
1263 | , | 1290 | , |
1264 | ((Expression)(yyq.StackAt(0).m_value)) | 1291 | ((Expression)(yyq.StackAt(0).m_value)) |
1265 | , | 1292 | , |
1266 | ((LEFT_SHIFT)(yyq.StackAt(1).m_value)) | 1293 | ((LEFT_SHIFT)(yyq.StackAt(1).m_value)) |
1267 | .yytext){}} | 1294 | .yytext){}} |
1268 | 1295 | ||
1269 | public class BinaryExpression_18 : BinaryExpression { | 1296 | public class BinaryExpression_18 : BinaryExpression { |
1270 | public BinaryExpression_18(Parser yyq):base(yyq, | 1297 | public BinaryExpression_18(Parser yyq):base(yyq, |
1271 | ((Expression)(yyq.StackAt(2).m_value)) | 1298 | ((Expression)(yyq.StackAt(2).m_value)) |
1272 | , | 1299 | , |
1273 | ((Expression)(yyq.StackAt(0).m_value)) | 1300 | ((Expression)(yyq.StackAt(0).m_value)) |
1274 | , | 1301 | , |
1275 | ((RIGHT_SHIFT)(yyq.StackAt(1).m_value)) | 1302 | ((RIGHT_SHIFT)(yyq.StackAt(1).m_value)) |
1276 | .yytext){}} | 1303 | .yytext){}} |
1277 | 1304 | ||
1278 | public class UnaryExpression_1 : UnaryExpression { | 1305 | public class UnaryExpression_1 : UnaryExpression { |
1279 | public UnaryExpression_1(Parser yyq):base(yyq, | 1306 | public UnaryExpression_1(Parser yyq):base(yyq, |
1280 | ((EXCLAMATION)(yyq.StackAt(1).m_value)) | 1307 | ((EXCLAMATION)(yyq.StackAt(1).m_value)) |
1281 | .yytext, | 1308 | .yytext, |
1282 | ((Expression)(yyq.StackAt(0).m_value)) | 1309 | ((Expression)(yyq.StackAt(0).m_value)) |
1283 | ){}} | 1310 | ){}} |
1284 | 1311 | ||
1285 | public class UnaryExpression_2 : UnaryExpression { | 1312 | public class UnaryExpression_2 : UnaryExpression { |
1286 | public UnaryExpression_2(Parser yyq):base(yyq, | 1313 | public UnaryExpression_2(Parser yyq):base(yyq, |
1287 | ((MINUS)(yyq.StackAt(1).m_value)) | 1314 | ((MINUS)(yyq.StackAt(1).m_value)) |
1288 | .yytext, | 1315 | .yytext, |
1289 | ((Expression)(yyq.StackAt(0).m_value)) | 1316 | ((Expression)(yyq.StackAt(0).m_value)) |
1290 | ){}} | 1317 | ){}} |
1291 | 1318 | ||
1292 | public class UnaryExpression_3 : UnaryExpression { | 1319 | public class UnaryExpression_3 : UnaryExpression { |
1293 | public UnaryExpression_3(Parser yyq):base(yyq, | 1320 | public UnaryExpression_3(Parser yyq):base(yyq, |
1294 | ((TILDE)(yyq.StackAt(1).m_value)) | 1321 | ((TILDE)(yyq.StackAt(1).m_value)) |
1295 | .yytext, | 1322 | .yytext, |
1296 | ((Expression)(yyq.StackAt(0).m_value)) | 1323 | ((Expression)(yyq.StackAt(0).m_value)) |
1297 | ){}} | 1324 | ){}} |
1298 | 1325 | ||
1299 | public class ParenthesisExpression_1 : ParenthesisExpression { | 1326 | public class ParenthesisExpression_1 : ParenthesisExpression { |
1300 | public ParenthesisExpression_1(Parser yyq):base(yyq, | 1327 | public ParenthesisExpression_1(Parser yyq):base(yyq, |
1301 | ((Expression)(yyq.StackAt(1).m_value)) | 1328 | ((Expression)(yyq.StackAt(1).m_value)) |
1302 | ){}} | 1329 | ){}} |
1303 | 1330 | ||
1304 | public class TypecastExpression_1 : TypecastExpression { | 1331 | public class TypecastExpression_1 : TypecastExpression { |
1305 | public TypecastExpression_1(Parser yyq):base(yyq, | 1332 | public TypecastExpression_1(Parser yyq):base(yyq, |
1306 | ((Typename)(yyq.StackAt(2).m_value)) | 1333 | ((Typename)(yyq.StackAt(2).m_value)) |
1307 | .yytext, | 1334 | .yytext, |
1308 | ((Constant)(yyq.StackAt(0).m_value)) | 1335 | ((Constant)(yyq.StackAt(0).m_value)) |
1309 | ){}} | 1336 | ){}} |
1310 | 1337 | ||
1311 | public class TypecastExpression_2 : TypecastExpression { | 1338 | public class TypecastExpression_2 : TypecastExpression { |
1312 | public TypecastExpression_2(Parser yyq):base(yyq, | 1339 | public TypecastExpression_2(Parser yyq):base(yyq, |
1313 | ((Typename)(yyq.StackAt(2).m_value)) | 1340 | ((Typename)(yyq.StackAt(2).m_value)) |
1314 | .yytext, new IdentExpression(((LSLSyntax | 1341 | .yytext, new IdentExpression(((LSLSyntax |
1315 | )yyq), | 1342 | )yyq), |
1316 | ((IDENT)(yyq.StackAt(0).m_value)) | 1343 | ((IDENT)(yyq.StackAt(0).m_value)) |
1317 | .yytext)){}} | 1344 | .yytext)){}} |
1318 | 1345 | ||
1319 | public class TypecastExpression_3 : TypecastExpression { | 1346 | public class TypecastExpression_3 : TypecastExpression { |
1320 | public TypecastExpression_3(Parser yyq):base(yyq, | 1347 | public TypecastExpression_3(Parser yyq):base(yyq, |
1321 | ((Typename)(yyq.StackAt(4).m_value)) | 1348 | ((Typename)(yyq.StackAt(4).m_value)) |
1322 | .yytext, new IdentDotExpression(((LSLSyntax | 1349 | .yytext, new IdentDotExpression(((LSLSyntax |
1323 | )yyq), | 1350 | )yyq), |
1324 | ((IDENT)(yyq.StackAt(2).m_value)) | 1351 | ((IDENT)(yyq.StackAt(2).m_value)) |
1325 | .yytext, | 1352 | .yytext, |
1326 | ((IDENT)(yyq.StackAt(0).m_value)) | 1353 | ((IDENT)(yyq.StackAt(0).m_value)) |
1327 | .yytext)){}} | 1354 | .yytext)){}} |
1328 | 1355 | ||
1329 | public class TypecastExpression_4 : TypecastExpression { | 1356 | public class TypecastExpression_4 : TypecastExpression { |
1330 | public TypecastExpression_4(Parser yyq):base(yyq, | 1357 | public TypecastExpression_4(Parser yyq):base(yyq, |
1331 | ((Typename)(yyq.StackAt(3).m_value)) | 1358 | ((Typename)(yyq.StackAt(3).m_value)) |
1332 | .yytext, new IncrementDecrementExpression(((LSLSyntax | 1359 | .yytext, new IncrementDecrementExpression(((LSLSyntax |
1333 | )yyq), | 1360 | )yyq), |
1334 | ((IDENT)(yyq.StackAt(1).m_value)) | 1361 | ((IDENT)(yyq.StackAt(1).m_value)) |
1335 | .yytext, | 1362 | .yytext, |
1336 | ((INCREMENT)(yyq.StackAt(0).m_value)) | 1363 | ((INCREMENT)(yyq.StackAt(0).m_value)) |
1337 | .yytext, true)){}} | 1364 | .yytext, true)){}} |
1338 | 1365 | ||
1339 | public class TypecastExpression_5 : TypecastExpression { | 1366 | public class TypecastExpression_5 : TypecastExpression { |
1340 | public TypecastExpression_5(Parser yyq):base(yyq, | 1367 | public TypecastExpression_5(Parser yyq):base(yyq, |
1341 | ((Typename)(yyq.StackAt(5).m_value)) | 1368 | ((Typename)(yyq.StackAt(5).m_value)) |
1342 | .yytext, new IncrementDecrementExpression(((LSLSyntax | 1369 | .yytext, new IncrementDecrementExpression(((LSLSyntax |
1343 | )yyq), new IdentDotExpression(((LSLSyntax | 1370 | )yyq), new IdentDotExpression(((LSLSyntax |
1344 | )yyq), | 1371 | )yyq), |
1345 | ((IDENT)(yyq.StackAt(3).m_value)) | 1372 | ((IDENT)(yyq.StackAt(3).m_value)) |
1346 | .yytext, | 1373 | .yytext, |
1347 | ((IDENT)(yyq.StackAt(1).m_value)) | 1374 | ((IDENT)(yyq.StackAt(1).m_value)) |
1348 | .yytext), | 1375 | .yytext), |
1349 | ((INCREMENT)(yyq.StackAt(0).m_value)) | 1376 | ((INCREMENT)(yyq.StackAt(0).m_value)) |
1350 | .yytext, true)){}} | 1377 | .yytext, true)){}} |
1351 | 1378 | ||
1352 | public class TypecastExpression_6 : TypecastExpression { | 1379 | public class TypecastExpression_6 : TypecastExpression { |
1353 | public TypecastExpression_6(Parser yyq):base(yyq, | 1380 | public TypecastExpression_6(Parser yyq):base(yyq, |
1354 | ((Typename)(yyq.StackAt(3).m_value)) | 1381 | ((Typename)(yyq.StackAt(3).m_value)) |
1355 | .yytext, new IncrementDecrementExpression(((LSLSyntax | 1382 | .yytext, new IncrementDecrementExpression(((LSLSyntax |
1356 | )yyq), | 1383 | )yyq), |
1357 | ((IDENT)(yyq.StackAt(1).m_value)) | 1384 | ((IDENT)(yyq.StackAt(1).m_value)) |
1358 | .yytext, | 1385 | .yytext, |
1359 | ((DECREMENT)(yyq.StackAt(0).m_value)) | 1386 | ((DECREMENT)(yyq.StackAt(0).m_value)) |
1360 | .yytext, true)){}} | 1387 | .yytext, true)){}} |
1361 | 1388 | ||
1362 | public class TypecastExpression_7 : TypecastExpression { | 1389 | public class TypecastExpression_7 : TypecastExpression { |
1363 | public TypecastExpression_7(Parser yyq):base(yyq, | 1390 | public TypecastExpression_7(Parser yyq):base(yyq, |
1364 | ((Typename)(yyq.StackAt(5).m_value)) | 1391 | ((Typename)(yyq.StackAt(5).m_value)) |
1365 | .yytext, new IncrementDecrementExpression(((LSLSyntax | 1392 | .yytext, new IncrementDecrementExpression(((LSLSyntax |
1366 | )yyq), new IdentDotExpression(((LSLSyntax | 1393 | )yyq), new IdentDotExpression(((LSLSyntax |
1367 | )yyq), | 1394 | )yyq), |
1368 | ((IDENT)(yyq.StackAt(3).m_value)) | 1395 | ((IDENT)(yyq.StackAt(3).m_value)) |
1369 | .yytext, | 1396 | .yytext, |
1370 | ((IDENT)(yyq.StackAt(1).m_value)) | 1397 | ((IDENT)(yyq.StackAt(1).m_value)) |
1371 | .yytext), | 1398 | .yytext), |
1372 | ((DECREMENT)(yyq.StackAt(0).m_value)) | 1399 | ((DECREMENT)(yyq.StackAt(0).m_value)) |
1373 | .yytext, true)){}} | 1400 | .yytext, true)){}} |
1374 | 1401 | ||
1375 | public class TypecastExpression_8 : TypecastExpression { | 1402 | public class TypecastExpression_8 : TypecastExpression { |
1376 | public TypecastExpression_8(Parser yyq):base(yyq, | 1403 | public TypecastExpression_8(Parser yyq):base(yyq, |
1377 | ((Typename)(yyq.StackAt(2).m_value)) | 1404 | ((Typename)(yyq.StackAt(2).m_value)) |
1378 | .yytext, | 1405 | .yytext, |
1379 | ((FunctionCall)(yyq.StackAt(0).m_value)) | 1406 | ((FunctionCall)(yyq.StackAt(0).m_value)) |
1380 | ){}} | 1407 | ){}} |
1381 | 1408 | ||
1382 | public class TypecastExpression_9 : TypecastExpression { | 1409 | public class TypecastExpression_9 : TypecastExpression { |
1383 | public TypecastExpression_9(Parser yyq):base(yyq, | 1410 | public TypecastExpression_9(Parser yyq):base(yyq, |
1384 | ((Typename)(yyq.StackAt(4).m_value)) | 1411 | ((Typename)(yyq.StackAt(4).m_value)) |
1385 | .yytext, | 1412 | .yytext, |
1386 | ((Expression)(yyq.StackAt(1).m_value)) | 1413 | ((Expression)(yyq.StackAt(1).m_value)) |
1387 | ){}} | 1414 | ){}} |
1388 | 1415 | ||
1389 | public class FunctionCall_1 : FunctionCall { | 1416 | public class FunctionCall_1 : FunctionCall { |
1390 | public FunctionCall_1(Parser yyq):base(yyq, | 1417 | public FunctionCall_1(Parser yyq):base(yyq, |
1391 | ((IDENT)(yyq.StackAt(3).m_value)) | 1418 | ((IDENT)(yyq.StackAt(3).m_value)) |
1392 | .yytext, | 1419 | .yytext, |
1393 | ((ArgumentList)(yyq.StackAt(1).m_value)) | 1420 | ((ArgumentList)(yyq.StackAt(1).m_value)) |
1394 | ){}} | 1421 | ){}} |
1395 | 1422 | ||
1396 | public class ArgumentList_1 : ArgumentList { | 1423 | public class ArgumentList_1 : ArgumentList { |
1397 | public ArgumentList_1(Parser yyq):base(yyq, | 1424 | public ArgumentList_1(Parser yyq):base(yyq, |
1398 | ((Argument)(yyq.StackAt(0).m_value)) | 1425 | ((Argument)(yyq.StackAt(0).m_value)) |
1399 | ){}} | 1426 | ){}} |
1400 | 1427 | ||
1401 | public class ArgumentList_2 : ArgumentList { | 1428 | public class ArgumentList_2 : ArgumentList { |
1402 | public ArgumentList_2(Parser yyq):base(yyq, | 1429 | public ArgumentList_2(Parser yyq):base(yyq, |
1403 | ((ArgumentList)(yyq.StackAt(2).m_value)) | 1430 | ((ArgumentList)(yyq.StackAt(2).m_value)) |
1404 | , | 1431 | , |
1405 | ((Argument)(yyq.StackAt(0).m_value)) | 1432 | ((Argument)(yyq.StackAt(0).m_value)) |
1406 | ){}} | 1433 | ){}} |
1407 | 1434 | ||
1408 | public class ExpressionArgument_1 : ExpressionArgument { | 1435 | public class ExpressionArgument_1 : ExpressionArgument { |
1409 | public ExpressionArgument_1(Parser yyq):base(yyq, | 1436 | public ExpressionArgument_1(Parser yyq):base(yyq, |
1410 | ((Expression)(yyq.StackAt(0).m_value)) | 1437 | ((Expression)(yyq.StackAt(0).m_value)) |
1411 | ){}} | 1438 | ){}} |
1412 | 1439 | ||
1413 | public class Typename_1 : Typename { | 1440 | public class Typename_1 : Typename { |
1414 | public Typename_1(Parser yyq):base(yyq, | 1441 | public Typename_1(Parser yyq):base(yyq, |
1415 | ((INTEGER_TYPE)(yyq.StackAt(0).m_value)) | 1442 | ((INTEGER_TYPE)(yyq.StackAt(0).m_value)) |
1416 | .yytext){}} | 1443 | .yytext){}} |
1417 | 1444 | ||
1418 | public class Typename_2 : Typename { | 1445 | public class Typename_2 : Typename { |
1419 | public Typename_2(Parser yyq):base(yyq, | 1446 | public Typename_2(Parser yyq):base(yyq, |
1420 | ((FLOAT_TYPE)(yyq.StackAt(0).m_value)) | 1447 | ((FLOAT_TYPE)(yyq.StackAt(0).m_value)) |
1421 | .yytext){}} | 1448 | .yytext){}} |
1422 | 1449 | ||
1423 | public class Typename_3 : Typename { | 1450 | public class Typename_3 : Typename { |
1424 | public Typename_3(Parser yyq):base(yyq, | 1451 | public Typename_3(Parser yyq):base(yyq, |
1425 | ((STRING_TYPE)(yyq.StackAt(0).m_value)) | 1452 | ((STRING_TYPE)(yyq.StackAt(0).m_value)) |
1426 | .yytext){}} | 1453 | .yytext){}} |
1427 | 1454 | ||
1428 | public class Typename_4 : Typename { | 1455 | public class Typename_4 : Typename { |
1429 | public Typename_4(Parser yyq):base(yyq, | 1456 | public Typename_4(Parser yyq):base(yyq, |
1430 | ((KEY_TYPE)(yyq.StackAt(0).m_value)) | 1457 | ((KEY_TYPE)(yyq.StackAt(0).m_value)) |
1431 | .yytext){}} | 1458 | .yytext){}} |
1432 | 1459 | ||
1433 | public class Typename_5 : Typename { | 1460 | public class Typename_5 : Typename { |
1434 | public Typename_5(Parser yyq):base(yyq, | 1461 | public Typename_5(Parser yyq):base(yyq, |
1435 | ((VECTOR_TYPE)(yyq.StackAt(0).m_value)) | 1462 | ((VECTOR_TYPE)(yyq.StackAt(0).m_value)) |
1436 | .yytext){}} | 1463 | .yytext){}} |
1437 | 1464 | ||
1438 | public class Typename_6 : Typename { | 1465 | public class Typename_6 : Typename { |
1439 | public Typename_6(Parser yyq):base(yyq, | 1466 | public Typename_6(Parser yyq):base(yyq, |
1440 | ((ROTATION_TYPE)(yyq.StackAt(0).m_value)) | 1467 | ((ROTATION_TYPE)(yyq.StackAt(0).m_value)) |
1441 | .yytext){}} | 1468 | .yytext){}} |
1442 | 1469 | ||
1443 | public class Typename_7 : Typename { | 1470 | public class Typename_7 : Typename { |
1444 | public Typename_7(Parser yyq):base(yyq, | 1471 | public Typename_7(Parser yyq):base(yyq, |
1445 | ((LIST_TYPE)(yyq.StackAt(0).m_value)) | 1472 | ((LIST_TYPE)(yyq.StackAt(0).m_value)) |
1446 | .yytext){}} | 1473 | .yytext){}} |
1447 | 1474 | ||
1448 | public class Event_1 : Event { | 1475 | public class Event_1 : Event { |
1449 | public Event_1(Parser yyq):base(yyq, | 1476 | public Event_1(Parser yyq):base(yyq, |
1450 | ((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) | 1477 | ((AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) |
1451 | .yytext){}} | 1478 | .yytext){}} |
1452 | 1479 | ||
1453 | public class Event_2 : Event { | 1480 | public class Event_2 : Event { |
1454 | public Event_2(Parser yyq):base(yyq, | 1481 | public Event_2(Parser yyq):base(yyq, |
1455 | ((AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) | 1482 | ((AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) |
1456 | .yytext){}} | 1483 | .yytext){}} |
1457 | 1484 | ||
1458 | public class Event_3 : Event { | 1485 | public class Event_3 : Event { |
1459 | public Event_3(Parser yyq):base(yyq, | 1486 | public Event_3(Parser yyq):base(yyq, |
1460 | ((ATTACH_EVENT)(yyq.StackAt(0).m_value)) | 1487 | ((ATTACH_EVENT)(yyq.StackAt(0).m_value)) |
1461 | .yytext){}} | 1488 | .yytext){}} |
1462 | 1489 | ||
1463 | public class Event_4 : Event { | 1490 | public class Event_4 : Event { |
1464 | public Event_4(Parser yyq):base(yyq, | 1491 | public Event_4(Parser yyq):base(yyq, |
1465 | ((CHANGED_EVENT)(yyq.StackAt(0).m_value)) | 1492 | ((CHANGED_EVENT)(yyq.StackAt(0).m_value)) |
1466 | .yytext){}} | 1493 | .yytext){}} |
1467 | 1494 | ||
1468 | public class Event_5 : Event { | 1495 | public class Event_5 : Event { |
1469 | public Event_5(Parser yyq):base(yyq, | 1496 | public Event_5(Parser yyq):base(yyq, |
1470 | ((COLLISION_EVENT)(yyq.StackAt(0).m_value)) | 1497 | ((COLLISION_EVENT)(yyq.StackAt(0).m_value)) |
1471 | .yytext){}} | 1498 | .yytext){}} |
1472 | 1499 | ||
1473 | public class Event_6 : Event { | 1500 | public class Event_6 : Event { |
1474 | public Event_6(Parser yyq):base(yyq, | 1501 | public Event_6(Parser yyq):base(yyq, |
1475 | ((COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) | 1502 | ((COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) |
1476 | .yytext){}} | 1503 | .yytext){}} |
1477 | 1504 | ||
1478 | public class Event_7 : Event { | 1505 | public class Event_7 : Event { |
1479 | public Event_7(Parser yyq):base(yyq, | 1506 | public Event_7(Parser yyq):base(yyq, |
1480 | ((COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) | 1507 | ((COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) |
1481 | .yytext){}} | 1508 | .yytext){}} |
1482 | 1509 | ||
1483 | public class Event_8 : Event { | 1510 | public class Event_8 : Event { |
1484 | public Event_8(Parser yyq):base(yyq, | 1511 | public Event_8(Parser yyq):base(yyq, |
1485 | ((CONTROL_EVENT)(yyq.StackAt(0).m_value)) | 1512 | ((CONTROL_EVENT)(yyq.StackAt(0).m_value)) |
1486 | .yytext){}} | 1513 | .yytext){}} |
1487 | 1514 | ||
1488 | public class Event_9 : Event { | 1515 | public class Event_9 : Event { |
1489 | public Event_9(Parser yyq):base(yyq, | 1516 | public Event_9(Parser yyq):base(yyq, |
1490 | ((DATASERVER_EVENT)(yyq.StackAt(0).m_value)) | 1517 | ((DATASERVER_EVENT)(yyq.StackAt(0).m_value)) |
1491 | .yytext){}} | 1518 | .yytext){}} |
1492 | 1519 | ||
1493 | public class Event_10 : Event { | 1520 | public class Event_10 : Event { |
1494 | public Event_10(Parser yyq):base(yyq, | 1521 | public Event_10(Parser yyq):base(yyq, |
1495 | ((EMAIL_EVENT)(yyq.StackAt(0).m_value)) | 1522 | ((EMAIL_EVENT)(yyq.StackAt(0).m_value)) |
1496 | .yytext){}} | 1523 | .yytext){}} |
1497 | 1524 | ||
1498 | public class Event_11 : Event { | 1525 | public class Event_11 : Event { |
1499 | public Event_11(Parser yyq):base(yyq, | 1526 | public Event_11(Parser yyq):base(yyq, |
1500 | ((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value)) | 1527 | ((HTTP_RESPONSE_EVENT)(yyq.StackAt(0).m_value)) |
1501 | .yytext){}} | 1528 | .yytext){}} |
1502 | 1529 | ||
1503 | public class Event_12 : Event { | 1530 | public class Event_12 : Event { |
1504 | public Event_12(Parser yyq):base(yyq, | 1531 | public Event_12(Parser yyq):base(yyq, |
1505 | ((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value)) | 1532 | ((LAND_COLLISION_EVENT)(yyq.StackAt(0).m_value)) |
1506 | .yytext){}} | 1533 | .yytext){}} |
1507 | 1534 | ||
1508 | public class Event_13 : Event { | 1535 | public class Event_13 : Event { |
1509 | public Event_13(Parser yyq):base(yyq, | 1536 | public Event_13(Parser yyq):base(yyq, |
1510 | ((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) | 1537 | ((LAND_COLLISION_END_EVENT)(yyq.StackAt(0).m_value)) |
1511 | .yytext){}} | 1538 | .yytext){}} |
1512 | 1539 | ||
1513 | public class Event_14 : Event { | 1540 | public class Event_14 : Event { |
1514 | public Event_14(Parser yyq):base(yyq, | 1541 | public Event_14(Parser yyq):base(yyq, |
1515 | ((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) | 1542 | ((LAND_COLLISION_START_EVENT)(yyq.StackAt(0).m_value)) |
1516 | .yytext){}} | 1543 | .yytext){}} |
1517 | 1544 | ||
1518 | public class Event_15 : Event { | 1545 | public class Event_15 : Event { |
1519 | public Event_15(Parser yyq):base(yyq, | 1546 | public Event_15(Parser yyq):base(yyq, |
1520 | ((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value)) | 1547 | ((LINK_MESSAGE_EVENT)(yyq.StackAt(0).m_value)) |
1521 | .yytext){}} | 1548 | .yytext){}} |
1522 | 1549 | ||
1523 | public class Event_16 : Event { | 1550 | public class Event_16 : Event { |
1524 | public Event_16(Parser yyq):base(yyq, | 1551 | public Event_16(Parser yyq):base(yyq, |
1525 | ((LISTEN_EVENT)(yyq.StackAt(0).m_value)) | 1552 | ((LISTEN_EVENT)(yyq.StackAt(0).m_value)) |
1526 | .yytext){}} | 1553 | .yytext){}} |
1527 | 1554 | ||
1528 | public class Event_17 : Event { | 1555 | public class Event_17 : Event { |
1529 | public Event_17(Parser yyq):base(yyq, | 1556 | public Event_17(Parser yyq):base(yyq, |
1530 | ((MONEY_EVENT)(yyq.StackAt(0).m_value)) | 1557 | ((MONEY_EVENT)(yyq.StackAt(0).m_value)) |
1531 | .yytext){}} | 1558 | .yytext){}} |
1532 | 1559 | ||
1533 | public class Event_18 : Event { | 1560 | public class Event_18 : Event { |
1534 | public Event_18(Parser yyq):base(yyq, | 1561 | public Event_18(Parser yyq):base(yyq, |
1535 | ((MOVING_END_EVENT)(yyq.StackAt(0).m_value)) | 1562 | ((MOVING_END_EVENT)(yyq.StackAt(0).m_value)) |
1536 | .yytext){}} | 1563 | .yytext){}} |
1537 | 1564 | ||
1538 | public class Event_19 : Event { | 1565 | public class Event_19 : Event { |
1539 | public Event_19(Parser yyq):base(yyq, | 1566 | public Event_19(Parser yyq):base(yyq, |
1540 | ((MOVING_START_EVENT)(yyq.StackAt(0).m_value)) | 1567 | ((MOVING_START_EVENT)(yyq.StackAt(0).m_value)) |
1541 | .yytext){}} | 1568 | .yytext){}} |
1542 | 1569 | ||
1543 | public class Event_20 : Event { | 1570 | public class Event_20 : Event { |
1544 | public Event_20(Parser yyq):base(yyq, | 1571 | public Event_20(Parser yyq):base(yyq, |
1545 | ((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value)) | 1572 | ((NO_SENSOR_EVENT)(yyq.StackAt(0).m_value)) |
1546 | .yytext){}} | 1573 | .yytext){}} |
1547 | 1574 | ||
1548 | public class Event_21 : Event { | 1575 | public class Event_21 : Event { |
1549 | public Event_21(Parser yyq):base(yyq, | 1576 | public Event_21(Parser yyq):base(yyq, |
1550 | ((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) | 1577 | ((NOT_AT_ROT_TARGET_EVENT)(yyq.StackAt(0).m_value)) |
1551 | .yytext){}} | 1578 | .yytext){}} |
1552 | 1579 | ||
1553 | public class Event_22 : Event { | 1580 | public class Event_22 : Event { |
1554 | public Event_22(Parser yyq):base(yyq, | 1581 | public Event_22(Parser yyq):base(yyq, |
1555 | ((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) | 1582 | ((NOT_AT_TARGET_EVENT)(yyq.StackAt(0).m_value)) |
1556 | .yytext){}} | 1583 | .yytext){}} |
1557 | 1584 | ||
1558 | public class Event_23 : Event { | 1585 | public class Event_23 : Event { |
1559 | public Event_23(Parser yyq):base(yyq, | 1586 | public Event_23(Parser yyq):base(yyq, |
1560 | ((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value)) | 1587 | ((OBJECT_REZ_EVENT)(yyq.StackAt(0).m_value)) |
1561 | .yytext){}} | 1588 | .yytext){}} |
1562 | 1589 | ||
1563 | public class Event_24 : Event { | 1590 | public class Event_24 : Event { |
1564 | public Event_24(Parser yyq):base(yyq, | 1591 | public Event_24(Parser yyq):base(yyq, |
1565 | ((ON_REZ_EVENT)(yyq.StackAt(0).m_value)) | 1592 | ((ON_REZ_EVENT)(yyq.StackAt(0).m_value)) |
1566 | .yytext){}} | 1593 | .yytext){}} |
1567 | 1594 | ||
1568 | public class Event_25 : Event { | 1595 | public class Event_25 : Event { |
1569 | public Event_25(Parser yyq):base(yyq, | 1596 | public Event_25(Parser yyq):base(yyq, |
1570 | ((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value)) | 1597 | ((REMOTE_DATA_EVENT)(yyq.StackAt(0).m_value)) |
1571 | .yytext){}} | 1598 | .yytext){}} |
1572 | 1599 | ||
1573 | public class Event_26 : Event { | 1600 | public class Event_26 : Event { |
1574 | public Event_26(Parser yyq):base(yyq, | 1601 | public Event_26(Parser yyq):base(yyq, |
1575 | ((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value)) | 1602 | ((RUN_TIME_PERMISSIONS_EVENT)(yyq.StackAt(0).m_value)) |
1576 | .yytext){}} | 1603 | .yytext){}} |
1577 | 1604 | ||
1578 | public class Event_27 : Event { | 1605 | public class Event_27 : Event { |
1579 | public Event_27(Parser yyq):base(yyq, | 1606 | public Event_27(Parser yyq):base(yyq, |
1580 | ((SENSOR_EVENT)(yyq.StackAt(0).m_value)) | 1607 | ((SENSOR_EVENT)(yyq.StackAt(0).m_value)) |
1581 | .yytext){}} | 1608 | .yytext){}} |
1582 | 1609 | ||
1583 | public class Event_28 : Event { | 1610 | public class Event_28 : Event { |
1584 | public Event_28(Parser yyq):base(yyq, | 1611 | public Event_28(Parser yyq):base(yyq, |
1585 | ((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value)) | 1612 | ((STATE_ENTRY_EVENT)(yyq.StackAt(0).m_value)) |
1586 | .yytext){}} | 1613 | .yytext){}} |
1587 | 1614 | ||
1588 | public class Event_29 : Event { | 1615 | public class Event_29 : Event { |
1589 | public Event_29(Parser yyq):base(yyq, | 1616 | public Event_29(Parser yyq):base(yyq, |
1590 | ((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value)) | 1617 | ((STATE_EXIT_EVENT)(yyq.StackAt(0).m_value)) |
1591 | .yytext){}} | 1618 | .yytext){}} |
1592 | 1619 | ||
1593 | public class Event_30 : Event { | 1620 | public class Event_30 : Event { |
1594 | public Event_30(Parser yyq):base(yyq, | 1621 | public Event_30(Parser yyq):base(yyq, |
1595 | ((TIMER_EVENT)(yyq.StackAt(0).m_value)) | 1622 | ((TIMER_EVENT)(yyq.StackAt(0).m_value)) |
1596 | .yytext){}} | 1623 | .yytext){}} |
1597 | 1624 | ||
1598 | public class Event_31 : Event { | 1625 | public class Event_31 : Event { |
1599 | public Event_31(Parser yyq):base(yyq, | 1626 | public Event_31(Parser yyq):base(yyq, |
1600 | ((TOUCH_EVENT)(yyq.StackAt(0).m_value)) | 1627 | ((TOUCH_EVENT)(yyq.StackAt(0).m_value)) |
1601 | .yytext){}} | 1628 | .yytext){}} |
1602 | 1629 | ||
1603 | public class Event_32 : Event { | 1630 | public class Event_32 : Event { |
1604 | public Event_32(Parser yyq):base(yyq, | 1631 | public Event_32(Parser yyq):base(yyq, |
1605 | ((TOUCH_END_EVENT)(yyq.StackAt(0).m_value)) | 1632 | ((TOUCH_END_EVENT)(yyq.StackAt(0).m_value)) |
1606 | .yytext){}} | 1633 | .yytext){}} |
1607 | 1634 | ||
1608 | public class Event_33 : Event { | 1635 | public class Event_33 : Event { |
1609 | public Event_33(Parser yyq):base(yyq, | 1636 | public Event_33(Parser yyq):base(yyq, |
1610 | ((TOUCH_START_EVENT)(yyq.StackAt(0).m_value)) | 1637 | ((TOUCH_START_EVENT)(yyq.StackAt(0).m_value)) |
1611 | .yytext){}} | 1638 | .yytext){}} |
1612 | public class yyLSLSyntax | 1639 | public class yyLSLSyntax |
1613 | : YyParser { | 1640 | : YyParser { |
1614 | public override object Action(Parser yyq,SYMBOL yysym, int yyact) { | 1641 | public override object Action(Parser yyq,SYMBOL yysym, int yyact) { |
1615 | switch(yyact) { | 1642 | switch(yyact) { |
1616 | case -1: break; //// keep compiler happy | 1643 | case -1: break; //// keep compiler happy |
1617 | } return null; } | 1644 | } return null; } |
1618 | 1645 | ||
1619 | public class ArgumentDeclarationList_3 : ArgumentDeclarationList { | 1646 | public class ArgumentDeclarationList_3 : ArgumentDeclarationList { |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 2d2a06a..4e781e6 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
132 | int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); | 132 | int eventFlags = m_scriptEngine.m_ScriptManager.GetStateEventFlags(localID, itemID); |
133 | m_host.SetScriptEvents(itemID, eventFlags); | 133 | m_host.SetScriptEvents(itemID, eventFlags); |
134 | m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); | 134 | m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); |
135 | if(postOnRez) | 135 | if (postOnRez) |
136 | { | 136 | { |
137 | m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "on_rez", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(startParam) }); | 137 | m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "on_rez", EventQueueManager.llDetectNull, new object[] { new LSL_Types.LSLInteger(startParam) }); |
138 | } | 138 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0e85340..26fe27b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2044,7 +2044,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2044 | { | 2044 | { |
2045 | m_host.AddScriptLPS(1); | 2045 | m_host.AddScriptLPS(1); |
2046 | IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>(); | 2046 | IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>(); |
2047 | if(emailModule == null) | 2047 | if (emailModule == null) |
2048 | return; | 2048 | return; |
2049 | 2049 | ||
2050 | emailModule.SendEmail(m_host.UUID, address, subject, message); | 2050 | emailModule.SendEmail(m_host.UUID, address, subject, message); |
@@ -2054,13 +2054,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2054 | { | 2054 | { |
2055 | m_host.AddScriptLPS(1); | 2055 | m_host.AddScriptLPS(1); |
2056 | IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>(); | 2056 | IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>(); |
2057 | if(emailModule == null) | 2057 | if (emailModule == null) |
2058 | return; | 2058 | return; |
2059 | Email email; | 2059 | Email email; |
2060 | 2060 | ||
2061 | email = emailModule.GetNextEmail(m_host.UUID, address, subject); | 2061 | email = emailModule.GetNextEmail(m_host.UUID, address, subject); |
2062 | 2062 | ||
2063 | if(email == null) | 2063 | if (email == null) |
2064 | return; | 2064 | return; |
2065 | 2065 | ||
2066 | m_ScriptEngine.PostObjectEvent(m_host.LocalId, | 2066 | m_ScriptEngine.PostObjectEvent(m_host.LocalId, |
@@ -3163,7 +3163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3163 | { | 3163 | { |
3164 | m_host.AddScriptLPS(1); | 3164 | m_host.AddScriptLPS(1); |
3165 | 3165 | ||
3166 | if(add != 0) | 3166 | if (add != 0) |
3167 | m_host.ParentGroup.RootPart.AllowedDrop = true; | 3167 | m_host.ParentGroup.RootPart.AllowedDrop = true; |
3168 | else | 3168 | else |
3169 | m_host.ParentGroup.RootPart.AllowedDrop = false; | 3169 | m_host.ParentGroup.RootPart.AllowedDrop = false; |
@@ -4283,7 +4283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4283 | { | 4283 | { |
4284 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) | 4284 | foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) |
4285 | { | 4285 | { |
4286 | if(inv.Value.Name == name) | 4286 | if (inv.Value.Name == name) |
4287 | return inv.Key; | 4287 | return inv.Key; |
4288 | } | 4288 | } |
4289 | return LLUUID.Zero; | 4289 | return LLUUID.Zero; |
@@ -4294,7 +4294,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4294 | m_host.AddScriptLPS(1); | 4294 | m_host.AddScriptLPS(1); |
4295 | 4295 | ||
4296 | LLUUID destID; | 4296 | LLUUID destID; |
4297 | if(!LLUUID.TryParse(destination, out destID)) | 4297 | if (!LLUUID.TryParse(destination, out destID)) |
4298 | return; | 4298 | return; |
4299 | 4299 | ||
4300 | List<LLUUID> itemList = new List<LLUUID>(); | 4300 | List<LLUUID> itemList = new List<LLUUID>(); |
@@ -4302,19 +4302,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4302 | foreach (Object item in inventory.Data) | 4302 | foreach (Object item in inventory.Data) |
4303 | { | 4303 | { |
4304 | LLUUID itemID; | 4304 | LLUUID itemID; |
4305 | if(LLUUID.TryParse(item.ToString(), out itemID)) | 4305 | if (LLUUID.TryParse(item.ToString(), out itemID)) |
4306 | { | 4306 | { |
4307 | itemList.Add(itemID); | 4307 | itemList.Add(itemID); |
4308 | } | 4308 | } |
4309 | else | 4309 | else |
4310 | { | 4310 | { |
4311 | itemID = GetTaskInventoryItem(item.ToString()); | 4311 | itemID = GetTaskInventoryItem(item.ToString()); |
4312 | if(itemID != LLUUID.Zero) | 4312 | if (itemID != LLUUID.Zero) |
4313 | itemList.Add(itemID); | 4313 | itemList.Add(itemID); |
4314 | } | 4314 | } |
4315 | } | 4315 | } |
4316 | 4316 | ||
4317 | if(itemList.Count == 0) | 4317 | if (itemList.Count == 0) |
4318 | return; | 4318 | return; |
4319 | 4319 | ||
4320 | m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList); | 4320 | m_ScriptEngine.World.MoveTaskInventoryItems(destID, category, m_host, itemList); |
@@ -4985,7 +4985,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4985 | LSL_Types.Vector3 holesize; | 4985 | LSL_Types.Vector3 holesize; |
4986 | LSL_Types.Vector3 profilecut; | 4986 | LSL_Types.Vector3 profilecut; |
4987 | 4987 | ||
4988 | switch(code) | 4988 | switch (code) |
4989 | { | 4989 | { |
4990 | case (int)ScriptBaseClass.PRIM_TYPE_BOX: | 4990 | case (int)ScriptBaseClass.PRIM_TYPE_BOX: |
4991 | if (remain < 6) | 4991 | if (remain < 6) |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 82d00a5..11b93b4 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -331,12 +331,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
331 | Object[] parms = new Object[] | 331 | Object[] parms = new Object[] |
332 | { localID, itemID, script, startParam, postOnRez}; | 332 | { localID, itemID, script, startParam, postOnRez}; |
333 | 333 | ||
334 | lock(m_CompileQueue) | 334 | lock (m_CompileQueue) |
335 | { | 335 | { |
336 | m_CompileQueue.Enqueue(parms); | 336 | m_CompileQueue.Enqueue(parms); |
337 | if(m_CurrentCompile == null) | 337 | if (m_CurrentCompile == null) |
338 | { | 338 | { |
339 | if(m_firstStart) | 339 | if (m_firstStart) |
340 | { | 340 | { |
341 | m_firstStart = false; | 341 | m_firstStart = false; |
342 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( | 342 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( |
@@ -355,9 +355,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
355 | { | 355 | { |
356 | Thread.Sleep(30000); | 356 | Thread.Sleep(30000); |
357 | 357 | ||
358 | lock(m_CompileQueue) | 358 | lock (m_CompileQueue) |
359 | { | 359 | { |
360 | if(m_CompileQueue.Count > 0) | 360 | if (m_CompileQueue.Count > 0) |
361 | { | 361 | { |
362 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( | 362 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( |
363 | new WorkItemCallback( | 363 | new WorkItemCallback( |
@@ -374,10 +374,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
374 | public Object DoOnRezScriptQueue(Object dummy) | 374 | public Object DoOnRezScriptQueue(Object dummy) |
375 | { | 375 | { |
376 | Object o; | 376 | Object o; |
377 | lock(m_CompileQueue) | 377 | lock (m_CompileQueue) |
378 | { | 378 | { |
379 | o = m_CompileQueue.Dequeue(); | 379 | o = m_CompileQueue.Dequeue(); |
380 | if(o == null) | 380 | if (o == null) |
381 | { | 381 | { |
382 | m_CurrentCompile = null; | 382 | m_CurrentCompile = null; |
383 | return null; | 383 | return null; |
@@ -386,9 +386,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
386 | 386 | ||
387 | DoOnRezScript(o); | 387 | DoOnRezScript(o); |
388 | 388 | ||
389 | lock(m_CompileQueue) | 389 | lock (m_CompileQueue) |
390 | { | 390 | { |
391 | if(m_CompileQueue.Count > 0) | 391 | if (m_CompileQueue.Count > 0) |
392 | { | 392 | { |
393 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( | 393 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( |
394 | new WorkItemCallback( | 394 | new WorkItemCallback( |
@@ -1056,7 +1056,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1056 | { | 1056 | { |
1057 | m_RunEvents = false; | 1057 | m_RunEvents = false; |
1058 | Start(); | 1058 | Start(); |
1059 | if(postOnRez) | 1059 | if (postOnRez) |
1060 | PostEvent(new EventParams("on_rez", | 1060 | PostEvent(new EventParams("on_rez", |
1061 | new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0])); | 1061 | new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0])); |
1062 | } | 1062 | } |
@@ -1078,7 +1078,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1078 | Start(); | 1078 | Start(); |
1079 | PostEvent(new EventParams("state_entry", | 1079 | PostEvent(new EventParams("state_entry", |
1080 | new Object[0], new DetectParams[0])); | 1080 | new Object[0], new DetectParams[0])); |
1081 | if(postOnRez) | 1081 | if (postOnRez) |
1082 | PostEvent(new EventParams("on_rez", | 1082 | PostEvent(new EventParams("on_rez", |
1083 | new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0])); | 1083 | new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0])); |
1084 | 1084 | ||
@@ -1090,7 +1090,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1090 | Start(); | 1090 | Start(); |
1091 | PostEvent(new EventParams("state_entry", | 1091 | PostEvent(new EventParams("state_entry", |
1092 | new Object[0], new DetectParams[0])); | 1092 | new Object[0], new DetectParams[0])); |
1093 | if(postOnRez) | 1093 | if (postOnRez) |
1094 | PostEvent(new EventParams("on_rez", | 1094 | PostEvent(new EventParams("on_rez", |
1095 | new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0])); | 1095 | new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0])); |
1096 | } | 1096 | } |
@@ -1102,7 +1102,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1102 | PostEvent(new EventParams("state_entry", | 1102 | PostEvent(new EventParams("state_entry", |
1103 | new Object[0], new DetectParams[0])); | 1103 | new Object[0], new DetectParams[0])); |
1104 | 1104 | ||
1105 | if(postOnRez) | 1105 | if (postOnRez) |
1106 | PostEvent(new EventParams("on_rez", | 1106 | PostEvent(new EventParams("on_rez", |
1107 | new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0])); | 1107 | new Object[] {new LSL_Types.LSLInteger(startParam)}, new DetectParams[0])); |
1108 | } | 1108 | } |
@@ -1215,7 +1215,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1215 | // m_Engine.Log.DebugFormat("[XEngine] Posted event {2} in state {3} to {0}.{1}", | 1215 | // m_Engine.Log.DebugFormat("[XEngine] Posted event {2} in state {3} to {0}.{1}", |
1216 | // m_PrimName, m_ScriptName, data.EventName, m_State); | 1216 | // m_PrimName, m_ScriptName, data.EventName, m_State); |
1217 | 1217 | ||
1218 | if(!Running) | 1218 | if (!Running) |
1219 | return; | 1219 | return; |
1220 | 1220 | ||
1221 | lock (m_EventQueue) | 1221 | lock (m_EventQueue) |
@@ -1393,7 +1393,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1393 | 1393 | ||
1394 | m_Script.ResetVars(); | 1394 | m_Script.ResetVars(); |
1395 | m_Engine.m_AsyncCommands.RemoveScript(m_LocalID, m_ItemID); | 1395 | m_Engine.m_AsyncCommands.RemoveScript(m_LocalID, m_ItemID); |
1396 | if(m_CurrentEvent != "state_entry") | 1396 | if (m_CurrentEvent != "state_entry") |
1397 | { | 1397 | { |
1398 | PostEvent(new EventParams("state_entry", | 1398 | PostEvent(new EventParams("state_entry", |
1399 | new Object[0], new DetectParams[0])); | 1399 | new Object[0], new DetectParams[0])); |