aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:09:17 +0000
committerAdam Frisby2008-04-21 07:09:17 +0000
commitfef3b3689492dea63693c964bcdbec9f5137eb5e (patch)
tree7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/ScriptEngine
parent* Terrain Module code has been reformatted to comply with guidelines. (diff)
downloadopensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs183
-rw-r--r--OpenSim/Region/ScriptEngine/Common/Executor.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs33
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs26
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs18
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs19
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs22
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs25
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs7
42 files changed, 212 insertions, 316 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs
index a429272..1a50f0b 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuilIn_Commands.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using libsecondlife; 28using libsecondlife;
32using OpenSim.Region.Environment.Scenes; 29using OpenSim.Region.Environment.Scenes;
33 30
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index b6468c2..8aee94e 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -26,15 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Runtime.Remoting.Lifetime; 29using System.Runtime.Remoting.Lifetime;
31using System.Threading; 30using System.Threading;
32using OpenSim.Region.ScriptEngine.Common; 31using OpenSim.Region.Environment.Interfaces;
33using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; 32using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
34using integer = System.Int32; 33using integer = System.Int32;
35using key = System.String; 34using key = System.String;
36using vector = OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3; 35using vector = ScriptEngine.Common.LSL_Types.Vector3;
37using rotation = OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion; 36using rotation = Quaternion;
38 37
39namespace OpenSim.Region.ScriptEngine.Common 38namespace OpenSim.Region.ScriptEngine.Common
40{ 39{
@@ -151,7 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Common
151 // They are only forwarders to LSL_BuiltIn_Commands.cs 150 // They are only forwarders to LSL_BuiltIn_Commands.cs
152 // 151 //
153 152
154 public OpenSim.Region.Environment.Interfaces.ICommander GetCommander(string name) 153 public ICommander GetCommander(string name)
155 { 154 {
156 return m_LSL_Functions.GetCommander(name); 155 return m_LSL_Functions.GetCommander(name);
157 } 156 }
@@ -216,52 +215,52 @@ namespace OpenSim.Region.ScriptEngine.Common
216 return m_LSL_Functions.llRound(f); 215 return m_LSL_Functions.llRound(f);
217 } 216 }
218 217
219 public double llVecMag(vector v) 218 public double llVecMag(LSL_Types.Vector3 v)
220 { 219 {
221 return m_LSL_Functions.llVecMag(v); 220 return m_LSL_Functions.llVecMag(v);
222 } 221 }
223 222
224 public vector llVecNorm(vector v) 223 public LSL_Types.Vector3 llVecNorm(LSL_Types.Vector3 v)
225 { 224 {
226 return m_LSL_Functions.llVecNorm(v); 225 return m_LSL_Functions.llVecNorm(v);
227 } 226 }
228 227
229 public double llVecDist(vector a, vector b) 228 public double llVecDist(LSL_Types.Vector3 a, LSL_Types.Vector3 b)
230 { 229 {
231 return m_LSL_Functions.llVecDist(a, b); 230 return m_LSL_Functions.llVecDist(a, b);
232 } 231 }
233 232
234 public vector llRot2Euler(rotation r) 233 public LSL_Types.Vector3 llRot2Euler(LSL_Types.Quaternion r)
235 { 234 {
236 return m_LSL_Functions.llRot2Euler(r); 235 return m_LSL_Functions.llRot2Euler(r);
237 } 236 }
238 237
239 public rotation llEuler2Rot(vector v) 238 public LSL_Types.Quaternion llEuler2Rot(LSL_Types.Vector3 v)
240 { 239 {
241 return m_LSL_Functions.llEuler2Rot(v); 240 return m_LSL_Functions.llEuler2Rot(v);
242 } 241 }
243 242
244 public rotation llAxes2Rot(vector fwd, vector left, vector up) 243 public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up)
245 { 244 {
246 return m_LSL_Functions.llAxes2Rot(fwd, left, up); 245 return m_LSL_Functions.llAxes2Rot(fwd, left, up);
247 } 246 }
248 247
249 public vector llRot2Fwd(rotation r) 248 public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r)
250 { 249 {
251 return m_LSL_Functions.llRot2Fwd(r); 250 return m_LSL_Functions.llRot2Fwd(r);
252 } 251 }
253 252
254 public vector llRot2Left(rotation r) 253 public LSL_Types.Vector3 llRot2Left(LSL_Types.Quaternion r)
255 { 254 {
256 return m_LSL_Functions.llRot2Left(r); 255 return m_LSL_Functions.llRot2Left(r);
257 } 256 }
258 257
259 public vector llRot2Up(rotation r) 258 public LSL_Types.Vector3 llRot2Up(LSL_Types.Quaternion r)
260 { 259 {
261 return m_LSL_Functions.llRot2Up(r); 260 return m_LSL_Functions.llRot2Up(r);
262 } 261 }
263 262
264 public rotation llRotBetween(vector start, vector end) 263 public LSL_Types.Quaternion llRotBetween(LSL_Types.Vector3 start, LSL_Types.Vector3 end)
265 { 264 {
266 return m_LSL_Functions.llRotBetween(start, end); 265 return m_LSL_Functions.llRotBetween(start, end);
267 } 266 }
@@ -334,22 +333,22 @@ namespace OpenSim.Region.ScriptEngine.Common
334 return m_LSL_Functions.llDetectedType(number); 333 return m_LSL_Functions.llDetectedType(number);
335 } 334 }
336 335
337 public vector llDetectedPos(int number) 336 public LSL_Types.Vector3 llDetectedPos(int number)
338 { 337 {
339 return m_LSL_Functions.llDetectedPos(number); 338 return m_LSL_Functions.llDetectedPos(number);
340 } 339 }
341 340
342 public vector llDetectedVel(int number) 341 public LSL_Types.Vector3 llDetectedVel(int number)
343 { 342 {
344 return m_LSL_Functions.llDetectedVel(number); 343 return m_LSL_Functions.llDetectedVel(number);
345 } 344 }
346 345
347 public vector llDetectedGrab(int number) 346 public LSL_Types.Vector3 llDetectedGrab(int number)
348 { 347 {
349 return m_LSL_Functions.llDetectedGrab(number); 348 return m_LSL_Functions.llDetectedGrab(number);
350 } 349 }
351 350
352 public rotation llDetectedRot(int number) 351 public LSL_Types.Quaternion llDetectedRot(int number)
353 { 352 {
354 return m_LSL_Functions.llDetectedRot(number); 353 return m_LSL_Functions.llDetectedRot(number);
355 } 354 }
@@ -372,17 +371,17 @@ namespace OpenSim.Region.ScriptEngine.Common
372 m_LSL_Functions.llDie(); 371 m_LSL_Functions.llDie();
373 } 372 }
374 373
375 public double llGround(vector offset) 374 public double llGround(LSL_Types.Vector3 offset)
376 { 375 {
377 return m_LSL_Functions.llGround(offset); 376 return m_LSL_Functions.llGround(offset);
378 } 377 }
379 378
380 public double llCloud(vector offset) 379 public double llCloud(LSL_Types.Vector3 offset)
381 { 380 {
382 return m_LSL_Functions.llCloud(offset); 381 return m_LSL_Functions.llCloud(offset);
383 } 382 }
384 383
385 public vector llWind(vector offset) 384 public LSL_Types.Vector3 llWind(LSL_Types.Vector3 offset)
386 { 385 {
387 return m_LSL_Functions.llWind(offset); 386 return m_LSL_Functions.llWind(offset);
388 } 387 }
@@ -397,17 +396,17 @@ namespace OpenSim.Region.ScriptEngine.Common
397 return m_LSL_Functions.llGetStatus(status); 396 return m_LSL_Functions.llGetStatus(status);
398 } 397 }
399 398
400 public void llSetScale(vector scale) 399 public void llSetScale(LSL_Types.Vector3 scale)
401 { 400 {
402 m_LSL_Functions.llSetScale(scale); 401 m_LSL_Functions.llSetScale(scale);
403 } 402 }
404 403
405 public vector llGetScale() 404 public LSL_Types.Vector3 llGetScale()
406 { 405 {
407 return m_LSL_Functions.llGetScale(); 406 return m_LSL_Functions.llGetScale();
408 } 407 }
409 408
410 public void llSetColor(vector color, int face) 409 public void llSetColor(LSL_Types.Vector3 color, int face)
411 { 410 {
412 m_LSL_Functions.llSetColor(color, face); 411 m_LSL_Functions.llSetColor(color, face);
413 } 412 }
@@ -422,7 +421,7 @@ namespace OpenSim.Region.ScriptEngine.Common
422 m_LSL_Functions.llSetAlpha(alpha, face); 421 m_LSL_Functions.llSetAlpha(alpha, face);
423 } 422 }
424 423
425 public vector llGetColor(int face) 424 public LSL_Types.Vector3 llGetColor(int face)
426 { 425 {
427 return m_LSL_Functions.llGetColor(face); 426 return m_LSL_Functions.llGetColor(face);
428 } 427 }
@@ -455,47 +454,47 @@ namespace OpenSim.Region.ScriptEngine.Common
455 // 454 //
456 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 455 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
457 // 456 //
458 public void llSetPos(vector pos) 457 public void llSetPos(LSL_Types.Vector3 pos)
459 { 458 {
460 m_LSL_Functions.llSetPos(pos); 459 m_LSL_Functions.llSetPos(pos);
461 } 460 }
462 461
463 public vector llGetPos() 462 public LSL_Types.Vector3 llGetPos()
464 { 463 {
465 return m_LSL_Functions.llGetPos(); 464 return m_LSL_Functions.llGetPos();
466 } 465 }
467 466
468 public vector llGetLocalPos() 467 public LSL_Types.Vector3 llGetLocalPos()
469 { 468 {
470 return m_LSL_Functions.llGetLocalPos(); 469 return m_LSL_Functions.llGetLocalPos();
471 } 470 }
472 471
473 public void llSetRot(rotation rot) 472 public void llSetRot(LSL_Types.Quaternion rot)
474 { 473 {
475 m_LSL_Functions.llSetRot(rot); 474 m_LSL_Functions.llSetRot(rot);
476 } 475 }
477 476
478 public rotation llGetRot() 477 public LSL_Types.Quaternion llGetRot()
479 { 478 {
480 return m_LSL_Functions.llGetRot(); 479 return m_LSL_Functions.llGetRot();
481 } 480 }
482 481
483 public rotation llGetLocalRot() 482 public LSL_Types.Quaternion llGetLocalRot()
484 { 483 {
485 return m_LSL_Functions.llGetLocalRot(); 484 return m_LSL_Functions.llGetLocalRot();
486 } 485 }
487 486
488 public void llSetForce(vector force, int local) 487 public void llSetForce(LSL_Types.Vector3 force, int local)
489 { 488 {
490 m_LSL_Functions.llSetForce(force, local); 489 m_LSL_Functions.llSetForce(force, local);
491 } 490 }
492 491
493 public vector llGetForce() 492 public LSL_Types.Vector3 llGetForce()
494 { 493 {
495 return m_LSL_Functions.llGetForce(); 494 return m_LSL_Functions.llGetForce();
496 } 495 }
497 496
498 public int llTarget(vector position, double range) 497 public int llTarget(LSL_Types.Vector3 position, double range)
499 { 498 {
500 return m_LSL_Functions.llTarget(position, range); 499 return m_LSL_Functions.llTarget(position, range);
501 } 500 }
@@ -505,7 +504,7 @@ namespace OpenSim.Region.ScriptEngine.Common
505 m_LSL_Functions.llTargetRemove(number); 504 m_LSL_Functions.llTargetRemove(number);
506 } 505 }
507 506
508 public int llRotTarget(rotation rot, double error) 507 public int llRotTarget(LSL_Types.Quaternion rot, double error)
509 { 508 {
510 return m_LSL_Functions.llRotTarget(rot, error); 509 return m_LSL_Functions.llRotTarget(rot, error);
511 } 510 }
@@ -515,7 +514,7 @@ namespace OpenSim.Region.ScriptEngine.Common
515 m_LSL_Functions.llRotTargetRemove(number); 514 m_LSL_Functions.llRotTargetRemove(number);
516 } 515 }
517 516
518 public void llMoveToTarget(vector target, double tau) 517 public void llMoveToTarget(LSL_Types.Vector3 target, double tau)
519 { 518 {
520 m_LSL_Functions.llMoveToTarget(target, tau); 519 m_LSL_Functions.llMoveToTarget(target, tau);
521 } 520 }
@@ -525,7 +524,7 @@ namespace OpenSim.Region.ScriptEngine.Common
525 m_LSL_Functions.llStopMoveToTarget(); 524 m_LSL_Functions.llStopMoveToTarget();
526 } 525 }
527 526
528 public void llApplyImpulse(vector force, int local) 527 public void llApplyImpulse(LSL_Types.Vector3 force, int local)
529 { 528 {
530 m_LSL_Functions.llApplyImpulse(force, local); 529 m_LSL_Functions.llApplyImpulse(force, local);
531 } 530 }
@@ -533,37 +532,37 @@ namespace OpenSim.Region.ScriptEngine.Common
533 // 532 //
534 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 533 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
535 // 534 //
536 public void llApplyRotationalImpulse(vector force, int local) 535 public void llApplyRotationalImpulse(LSL_Types.Vector3 force, int local)
537 { 536 {
538 m_LSL_Functions.llApplyRotationalImpulse(force, local); 537 m_LSL_Functions.llApplyRotationalImpulse(force, local);
539 } 538 }
540 539
541 public void llSetTorque(vector torque, int local) 540 public void llSetTorque(LSL_Types.Vector3 torque, int local)
542 { 541 {
543 m_LSL_Functions.llSetTorque(torque, local); 542 m_LSL_Functions.llSetTorque(torque, local);
544 } 543 }
545 544
546 public vector llGetTorque() 545 public LSL_Types.Vector3 llGetTorque()
547 { 546 {
548 return m_LSL_Functions.llGetTorque(); 547 return m_LSL_Functions.llGetTorque();
549 } 548 }
550 549
551 public void llSetForceAndTorque(vector force, vector torque, int local) 550 public void llSetForceAndTorque(LSL_Types.Vector3 force, LSL_Types.Vector3 torque, int local)
552 { 551 {
553 m_LSL_Functions.llSetForceAndTorque(force, torque, local); 552 m_LSL_Functions.llSetForceAndTorque(force, torque, local);
554 } 553 }
555 554
556 public vector llGetVel() 555 public LSL_Types.Vector3 llGetVel()
557 { 556 {
558 return m_LSL_Functions.llGetVel(); 557 return m_LSL_Functions.llGetVel();
559 } 558 }
560 559
561 public vector llGetAccel() 560 public LSL_Types.Vector3 llGetAccel()
562 { 561 {
563 return m_LSL_Functions.llGetAccel(); 562 return m_LSL_Functions.llGetAccel();
564 } 563 }
565 564
566 public vector llGetOmega() 565 public LSL_Types.Vector3 llGetOmega()
567 { 566 {
568 return m_LSL_Functions.llGetOmega(); 567 return m_LSL_Functions.llGetOmega();
569 } 568 }
@@ -691,12 +690,12 @@ namespace OpenSim.Region.ScriptEngine.Common
691 m_LSL_Functions.llMakeFire(); 690 m_LSL_Functions.llMakeFire();
692 } 691 }
693 692
694 public void llRezObject(string inventory, vector pos, rotation rot, int param) 693 public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param)
695 { 694 {
696 m_LSL_Functions.llRezObject(inventory, pos, rot, param); 695 m_LSL_Functions.llRezObject(inventory, pos, rot, param);
697 } 696 }
698 697
699 public void llLookAt(vector target, double strength, double damping) 698 public void llLookAt(LSL_Types.Vector3 target, double strength, double damping)
700 { 699 {
701 m_LSL_Functions.llLookAt(target, strength, damping); 700 m_LSL_Functions.llLookAt(target, strength, damping);
702 } 701 }
@@ -809,7 +808,7 @@ namespace OpenSim.Region.ScriptEngine.Common
809 m_LSL_Functions.llSoundPreload(); 808 m_LSL_Functions.llSoundPreload();
810 } 809 }
811 810
812 public void llRotLookAt(rotation target, double strength, double damping) 811 public void llRotLookAt(LSL_Types.Quaternion target, double strength, double damping)
813 { 812 {
814 m_LSL_Functions.llRotLookAt(target, strength, damping); 813 m_LSL_Functions.llRotLookAt(target, strength, damping);
815 } 814 }
@@ -842,7 +841,7 @@ namespace OpenSim.Region.ScriptEngine.Common
842 m_LSL_Functions.llStopPointAt(); 841 m_LSL_Functions.llStopPointAt();
843 } 842 }
844 843
845 public void llTargetOmega(vector axis, double spinrate, double gain) 844 public void llTargetOmega(LSL_Types.Vector3 axis, double spinrate, double gain)
846 { 845 {
847 m_LSL_Functions.llTargetOmega(axis, spinrate, gain); 846 m_LSL_Functions.llTargetOmega(axis, spinrate, gain);
848 } 847 }
@@ -852,7 +851,7 @@ namespace OpenSim.Region.ScriptEngine.Common
852 return m_LSL_Functions.llGetStartParameter(); 851 return m_LSL_Functions.llGetStartParameter();
853 } 852 }
854 853
855 public void llGodLikeRezObject(string inventory, vector pos) 854 public void llGodLikeRezObject(string inventory, LSL_Types.Vector3 pos)
856 { 855 {
857 m_LSL_Functions.llGodLikeRezObject(inventory, pos); 856 m_LSL_Functions.llGodLikeRezObject(inventory, pos);
858 } 857 }
@@ -877,7 +876,7 @@ namespace OpenSim.Region.ScriptEngine.Common
877 return m_LSL_Functions.llGetLinkNumber(); 876 return m_LSL_Functions.llGetLinkNumber();
878 } 877 }
879 878
880 public void llSetLinkColor(int linknumber, vector color, int face) 879 public void llSetLinkColor(int linknumber, LSL_Types.Vector3 color, int face)
881 { 880 {
882 m_LSL_Functions.llSetLinkColor(linknumber, color, face); 881 m_LSL_Functions.llSetLinkColor(linknumber, color, face);
883 } 882 }
@@ -940,12 +939,12 @@ namespace OpenSim.Region.ScriptEngine.Common
940 m_LSL_Functions.llRemoveInventory(item); 939 m_LSL_Functions.llRemoveInventory(item);
941 } 940 }
942 941
943 public void llSetText(string text, vector color, double alpha) 942 public void llSetText(string text, LSL_Types.Vector3 color, double alpha)
944 { 943 {
945 m_LSL_Functions.llSetText(text, color, alpha); 944 m_LSL_Functions.llSetText(text, color, alpha);
946 } 945 }
947 946
948 public double llWater(vector offset) 947 public double llWater(LSL_Types.Vector3 offset)
949 { 948 {
950 return m_LSL_Functions.llWater(offset); 949 return m_LSL_Functions.llWater(offset);
951 } 950 }
@@ -1005,7 +1004,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1005 m_LSL_Functions.llMessageLinked(linknum, num, str, id); 1004 m_LSL_Functions.llMessageLinked(linknum, num, str, id);
1006 } 1005 }
1007 1006
1008 public void llPushObject(string target, vector impulse, vector ang_impulse, int local) 1007 public void llPushObject(string target, LSL_Types.Vector3 impulse, LSL_Types.Vector3 ang_impulse, int local)
1009 { 1008 {
1010 m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local); 1009 m_LSL_Functions.llPushObject(target, impulse, ang_impulse, local);
1011 } 1010 }
@@ -1028,12 +1027,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1028 // 1027 //
1029 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 1028 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
1030 // 1029 //
1031 public rotation llAxisAngle2Rot(vector axis, double angle) 1030 public LSL_Types.Quaternion llAxisAngle2Rot(LSL_Types.Vector3 axis, double angle)
1032 { 1031 {
1033 return m_LSL_Functions.llAxisAngle2Rot(axis, angle); 1032 return m_LSL_Functions.llAxisAngle2Rot(axis, angle);
1034 } 1033 }
1035 1034
1036 public vector llRot2Axis(rotation rot) 1035 public LSL_Types.Vector3 llRot2Axis(LSL_Types.Quaternion rot)
1037 { 1036 {
1038 return m_LSL_Functions.llRot2Axis(rot); 1037 return m_LSL_Functions.llRot2Axis(rot);
1039 } 1038 }
@@ -1053,7 +1052,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1053 return m_LSL_Functions.llAsin(val); 1052 return m_LSL_Functions.llAsin(val);
1054 } 1053 }
1055 1054
1056 public double llAngleBetween(rotation a, rotation b) 1055 public double llAngleBetween(LSL_Types.Quaternion a, LSL_Types.Quaternion b)
1057 { 1056 {
1058 return m_LSL_Functions.llAngleBetween(a, b); 1057 return m_LSL_Functions.llAngleBetween(a, b);
1059 } 1058 }
@@ -1068,17 +1067,17 @@ namespace OpenSim.Region.ScriptEngine.Common
1068 m_LSL_Functions.llAllowInventoryDrop(add); 1067 m_LSL_Functions.llAllowInventoryDrop(add);
1069 } 1068 }
1070 1069
1071 public vector llGetSunDirection() 1070 public LSL_Types.Vector3 llGetSunDirection()
1072 { 1071 {
1073 return m_LSL_Functions.llGetSunDirection(); 1072 return m_LSL_Functions.llGetSunDirection();
1074 } 1073 }
1075 1074
1076 public vector llGetTextureOffset(int face) 1075 public LSL_Types.Vector3 llGetTextureOffset(int face)
1077 { 1076 {
1078 return m_LSL_Functions.llGetTextureOffset(face); 1077 return m_LSL_Functions.llGetTextureOffset(face);
1079 } 1078 }
1080 1079
1081 public vector llGetTextureScale(int side) 1080 public LSL_Types.Vector3 llGetTextureScale(int side)
1082 { 1081 {
1083 return m_LSL_Functions.llGetTextureScale(side); 1082 return m_LSL_Functions.llGetTextureScale(side);
1084 } 1083 }
@@ -1098,7 +1097,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1098 return m_LSL_Functions.llGetOwnerKey(id); 1097 return m_LSL_Functions.llGetOwnerKey(id);
1099 } 1098 }
1100 1099
1101 public vector llGetCenterOfMass() 1100 public LSL_Types.Vector3 llGetCenterOfMass()
1102 { 1101 {
1103 return m_LSL_Functions.llGetCenterOfMass(); 1102 return m_LSL_Functions.llGetCenterOfMass();
1104 } 1103 }
@@ -1136,12 +1135,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1136 return m_LSL_Functions.llList2Key(src, index); 1135 return m_LSL_Functions.llList2Key(src, index);
1137 } 1136 }
1138 1137
1139 public vector llList2Vector(LSL_Types.list src, int index) 1138 public LSL_Types.Vector3 llList2Vector(LSL_Types.list src, int index)
1140 { 1139 {
1141 return m_LSL_Functions.llList2Vector(src, index); 1140 return m_LSL_Functions.llList2Vector(src, index);
1142 } 1141 }
1143 1142
1144 public rotation llList2Rot(LSL_Types.list src, int index) 1143 public LSL_Types.Quaternion llList2Rot(LSL_Types.list src, int index)
1145 { 1144 {
1146 return m_LSL_Functions.llList2Rot(src, index); 1145 return m_LSL_Functions.llList2Rot(src, index);
1147 } 1146 }
@@ -1181,7 +1180,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1181 return m_LSL_Functions.llList2ListStrided(src, start, end, stride); 1180 return m_LSL_Functions.llList2ListStrided(src, start, end, stride);
1182 } 1181 }
1183 1182
1184 public vector llGetRegionCorner() 1183 public LSL_Types.Vector3 llGetRegionCorner()
1185 { 1184 {
1186 return m_LSL_Functions.llGetRegionCorner(); 1185 return m_LSL_Functions.llGetRegionCorner();
1187 } 1186 }
@@ -1211,7 +1210,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1211 return m_LSL_Functions.llGetDate(); 1210 return m_LSL_Functions.llGetDate();
1212 } 1211 }
1213 1212
1214 public int llEdgeOfWorld(vector pos, vector dir) 1213 public int llEdgeOfWorld(LSL_Types.Vector3 pos, LSL_Types.Vector3 dir)
1215 { 1214 {
1216 return m_LSL_Functions.llEdgeOfWorld(pos, dir); 1215 return m_LSL_Functions.llEdgeOfWorld(pos, dir);
1217 } 1216 }
@@ -1249,7 +1248,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1249 m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate); 1248 m_LSL_Functions.llSetTextureAnim(mode, face, sizex, sizey, start, length, rate);
1250 } 1249 }
1251 1250
1252 public void llTriggerSoundLimited(string sound, double volume, vector top_north_east, vector bottom_south_west) 1251 public void llTriggerSoundLimited(string sound, double volume, LSL_Types.Vector3 top_north_east, LSL_Types.Vector3 bottom_south_west)
1253 { 1252 {
1254 m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west); 1253 m_LSL_Functions.llTriggerSoundLimited(sound, volume, top_north_east, bottom_south_west);
1255 } 1254 }
@@ -1269,7 +1268,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1269 return m_LSL_Functions.llOverMyLand(id); 1268 return m_LSL_Functions.llOverMyLand(id);
1270 } 1269 }
1271 1270
1272 public string llGetLandOwnerAt(vector pos) 1271 public string llGetLandOwnerAt(LSL_Types.Vector3 pos)
1273 { 1272 {
1274 return m_LSL_Functions.llGetLandOwnerAt(pos); 1273 return m_LSL_Functions.llGetLandOwnerAt(pos);
1275 } 1274 }
@@ -1279,7 +1278,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1279 return m_LSL_Functions.llGetNotecardLine(name, line); 1278 return m_LSL_Functions.llGetNotecardLine(name, line);
1280 } 1279 }
1281 1280
1282 public vector llGetAgentSize(string id) 1281 public LSL_Types.Vector3 llGetAgentSize(string id)
1283 { 1282 {
1284 return m_LSL_Functions.llGetAgentSize(id); 1283 return m_LSL_Functions.llGetAgentSize(id);
1285 } 1284 }
@@ -1294,17 +1293,17 @@ namespace OpenSim.Region.ScriptEngine.Common
1294 m_LSL_Functions.llUnSit(id); 1293 m_LSL_Functions.llUnSit(id);
1295 } 1294 }
1296 1295
1297 public vector llGroundSlope(vector offset) 1296 public LSL_Types.Vector3 llGroundSlope(LSL_Types.Vector3 offset)
1298 { 1297 {
1299 return m_LSL_Functions.llGroundSlope(offset); 1298 return m_LSL_Functions.llGroundSlope(offset);
1300 } 1299 }
1301 1300
1302 public vector llGroundNormal(vector offset) 1301 public LSL_Types.Vector3 llGroundNormal(LSL_Types.Vector3 offset)
1303 { 1302 {
1304 return m_LSL_Functions.llGroundNormal(offset); 1303 return m_LSL_Functions.llGroundNormal(offset);
1305 } 1304 }
1306 1305
1307 public vector llGroundContour(vector offset) 1306 public LSL_Types.Vector3 llGroundContour(LSL_Types.Vector3 offset)
1308 { 1307 {
1309 return m_LSL_Functions.llGroundContour(offset); 1308 return m_LSL_Functions.llGroundContour(offset);
1310 } 1309 }
@@ -1362,12 +1361,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1362 m_LSL_Functions.llSetVehicledoubleParam(param, value); 1361 m_LSL_Functions.llSetVehicledoubleParam(param, value);
1363 } 1362 }
1364 1363
1365 public void llSetVehicleVectorParam(int param, vector vec) 1364 public void llSetVehicleVectorParam(int param, LSL_Types.Vector3 vec)
1366 { 1365 {
1367 m_LSL_Functions.llSetVehicleVectorParam(param, vec); 1366 m_LSL_Functions.llSetVehicleVectorParam(param, vec);
1368 } 1367 }
1369 1368
1370 public void llSetVehicleRotationParam(int param, rotation rot) 1369 public void llSetVehicleRotationParam(int param, LSL_Types.Quaternion rot)
1371 { 1370 {
1372 m_LSL_Functions.llSetVehicleRotationParam(param, rot); 1371 m_LSL_Functions.llSetVehicleRotationParam(param, rot);
1373 } 1372 }
@@ -1382,7 +1381,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1382 m_LSL_Functions.llRemoveVehicleFlags(flags); 1381 m_LSL_Functions.llRemoveVehicleFlags(flags);
1383 } 1382 }
1384 1383
1385 public void llSitTarget(vector offset, rotation rot) 1384 public void llSitTarget(LSL_Types.Vector3 offset, LSL_Types.Quaternion rot)
1386 { 1385 {
1387 m_LSL_Functions.llSitTarget(offset, rot); 1386 m_LSL_Functions.llSitTarget(offset, rot);
1388 } 1387 }
@@ -1407,12 +1406,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1407 m_LSL_Functions.llSetSitText(text); 1406 m_LSL_Functions.llSetSitText(text);
1408 } 1407 }
1409 1408
1410 public void llSetCameraEyeOffset(vector offset) 1409 public void llSetCameraEyeOffset(LSL_Types.Vector3 offset)
1411 { 1410 {
1412 m_LSL_Functions.llSetCameraEyeOffset(offset); 1411 m_LSL_Functions.llSetCameraEyeOffset(offset);
1413 } 1412 }
1414 1413
1415 public void llSetCameraAtOffset(vector offset) 1414 public void llSetCameraAtOffset(LSL_Types.Vector3 offset)
1416 { 1415 {
1417 m_LSL_Functions.llSetCameraAtOffset(offset); 1416 m_LSL_Functions.llSetCameraAtOffset(offset);
1418 } 1417 }
@@ -1422,7 +1421,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1422 return m_LSL_Functions.llDumpList2String(src, seperator); 1421 return m_LSL_Functions.llDumpList2String(src, seperator);
1423 } 1422 }
1424 1423
1425 public void llScriptDanger(vector pos) 1424 public void llScriptDanger(LSL_Types.Vector3 pos)
1426 { 1425 {
1427 m_LSL_Functions.llScriptDanger(pos); 1426 m_LSL_Functions.llScriptDanger(pos);
1428 } 1427 }
@@ -1539,12 +1538,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1539 m_LSL_Functions.llSetParcelMusicURL(url); 1538 m_LSL_Functions.llSetParcelMusicURL(url);
1540 } 1539 }
1541 1540
1542 public vector llGetRootPosition() 1541 public LSL_Types.Vector3 llGetRootPosition()
1543 { 1542 {
1544 return m_LSL_Functions.llGetRootPosition(); 1543 return m_LSL_Functions.llGetRootPosition();
1545 } 1544 }
1546 1545
1547 public rotation llGetRootRotation() 1546 public LSL_Types.Quaternion llGetRootRotation()
1548 { 1547 {
1549 return m_LSL_Functions.llGetRootRotation(); 1548 return m_LSL_Functions.llGetRootRotation();
1550 } 1549 }
@@ -1589,7 +1588,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1589 return m_LSL_Functions.llGetBoundingBox(obj); 1588 return m_LSL_Functions.llGetBoundingBox(obj);
1590 } 1589 }
1591 1590
1592 public vector llGetGeometricCenter() 1591 public LSL_Types.Vector3 llGetGeometricCenter()
1593 { 1592 {
1594 return m_LSL_Functions.llGetGeometricCenter(); 1593 return m_LSL_Functions.llGetGeometricCenter();
1595 } 1594 }
@@ -1622,7 +1621,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1622 return m_LSL_Functions.llGetSimulatorHostname(); 1621 return m_LSL_Functions.llGetSimulatorHostname();
1623 } 1622 }
1624 1623
1625 public void llSetLocalRot(rotation rot) 1624 public void llSetLocalRot(LSL_Types.Quaternion rot)
1626 { 1625 {
1627 m_LSL_Functions.llSetLocalRot(rot); 1626 m_LSL_Functions.llSetLocalRot(rot);
1628 } 1627 }
@@ -1632,7 +1631,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1632 return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers); 1631 return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers);
1633 } 1632 }
1634 1633
1635 public void llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, int param) 1634 public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, LSL_Types.Quaternion rot, int param)
1636 { 1635 {
1637 m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param); 1636 m_LSL_Functions.llRezAtRoot(inventory, position, velocity, rot, param);
1638 } 1637 }
@@ -1720,12 +1719,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1720 m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons); 1719 m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons);
1721 } 1720 }
1722 1721
1723 public vector llGetCameraPos() 1722 public LSL_Types.Vector3 llGetCameraPos()
1724 { 1723 {
1725 return m_LSL_Functions.llGetCameraPos(); 1724 return m_LSL_Functions.llGetCameraPos();
1726 } 1725 }
1727 1726
1728 public rotation llGetCameraRot() 1727 public LSL_Types.Quaternion llGetCameraRot()
1729 { 1728 {
1730 return m_LSL_Functions.llGetCameraRot(); 1729 return m_LSL_Functions.llGetCameraRot();
1731 } 1730 }
@@ -1750,7 +1749,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1750 return m_LSL_Functions.llUnescapeURL(url); 1749 return m_LSL_Functions.llUnescapeURL(url);
1751 } 1750 }
1752 1751
1753 public void llMapDestination(string simname, vector pos, vector look_at) 1752 public void llMapDestination(string simname, LSL_Types.Vector3 pos, LSL_Types.Vector3 look_at)
1754 { 1753 {
1755 m_LSL_Functions.llMapDestination(simname, pos, look_at); 1754 m_LSL_Functions.llMapDestination(simname, pos, look_at);
1756 } 1755 }
@@ -1790,7 +1789,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1790 return m_LSL_Functions.llGetUnixTime(); 1789 return m_LSL_Functions.llGetUnixTime();
1791 } 1790 }
1792 1791
1793 public int llGetParcelFlags(vector pos) 1792 public int llGetParcelFlags(LSL_Types.Vector3 pos)
1794 { 1793 {
1795 return m_LSL_Functions.llGetParcelFlags(pos); 1794 return m_LSL_Functions.llGetParcelFlags(pos);
1796 } 1795 }
@@ -1820,12 +1819,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1820 m_LSL_Functions.llResetLandPassList(); 1819 m_LSL_Functions.llResetLandPassList();
1821 } 1820 }
1822 1821
1823 public int llGetParcelPrimCount(vector pos, int category, int sim_wide) 1822 public int llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide)
1824 { 1823 {
1825 return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); 1824 return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide);
1826 } 1825 }
1827 1826
1828 public LSL_Types.list llGetParcelPrimOwners(vector pos) 1827 public LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos)
1829 { 1828 {
1830 return m_LSL_Functions.llGetParcelPrimOwners(pos); 1829 return m_LSL_Functions.llGetParcelPrimOwners(pos);
1831 } 1830 }
@@ -1838,12 +1837,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1838 // 1837 //
1839 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs 1838 // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs
1840 // 1839 //
1841 public int llGetParcelMaxPrims(vector pos, int sim_wide) 1840 public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide)
1842 { 1841 {
1843 return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); 1842 return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide);
1844 } 1843 }
1845 1844
1846 public LSL_Types.list llGetParcelDetails(vector pos, LSL_Types.list param) 1845 public LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param)
1847 { 1846 {
1848 return m_LSL_Functions.llGetParcelDetails(pos, param); 1847 return m_LSL_Functions.llGetParcelDetails(pos, param);
1849 } 1848 }
@@ -2381,7 +2380,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2381 public const int OBJECT_CREATOR = 8; 2380 public const int OBJECT_CREATOR = 8;
2382 2381
2383 // Can not be public const? 2382 // Can not be public const?
2384 public vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0); 2383 public LSL_Types.Vector3 ZERO_VECTOR = new LSL_Types.Vector3(0.0, 0.0, 0.0);
2385 public rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0); 2384 public LSL_Types.Quaternion ZERO_ROTATION = new LSL_Types.Quaternion(0.0, 0, 0.0, 1.0);
2386 } 2385 }
2387} 2386}
diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs
index 45f7355..8e0d6f1 100644
--- a/OpenSim/Region/ScriptEngine/Common/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Runtime.Remoting.Lifetime;
32 31
33namespace OpenSim.Region.ScriptEngine.Common 32namespace OpenSim.Region.ScriptEngine.Common
34{ 33{
diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
index 50eb56f..19fb487 100644
--- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Runtime.Remoting.Lifetime; 29using System.Runtime.Remoting.Lifetime;
31using System.Text;
32 30
33namespace OpenSim.Region.ScriptEngine.Common 31namespace OpenSim.Region.ScriptEngine.Common
34{ 32{
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index c00254d..04f8967 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -34,13 +34,12 @@ using System.Threading;
34using Axiom.Math; 34using Axiom.Math;
35using libsecondlife; 35using libsecondlife;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications; 37using OpenSim.Region.Environment;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Modules.LandManagement;
39using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Environment.Scenes;
40using OpenSim.Region.ScriptEngine.Common;
41using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; 41using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
42using OpenSim.Region.Environment; 42
43using OpenSim.Region.Environment.Modules.LandManagement;
44//using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL; 43//using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL;
45 44
46namespace OpenSim.Region.ScriptEngine.Common 45namespace OpenSim.Region.ScriptEngine.Common
@@ -86,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Common
86 } 85 }
87 catch (AppDomainUnloadedException) 86 catch (AppDomainUnloadedException)
88 { 87 {
89 System.Console.WriteLine("[SCRIPT]: state change called when script was unloaded. Nothing to worry about, but noting the occurance"); 88 Console.WriteLine("[SCRIPT]: state change called when script was unloaded. Nothing to worry about, but noting the occurance");
90 } 89 }
91 } 90 }
92 } 91 }
@@ -1677,10 +1676,10 @@ namespace OpenSim.Region.ScriptEngine.Common
1677 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 1676 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
1678 1677
1679 GridInstantMessage msg = new GridInstantMessage(); 1678 GridInstantMessage msg = new GridInstantMessage();
1680 msg.fromAgentID = new System.Guid(m_host.UUID.ToString()); // fromAgentID.UUID; 1679 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.UUID;
1681 msg.fromAgentSession = new System.Guid(friendTransactionID.ToString());// fromAgentSession.UUID; 1680 msg.fromAgentSession = new Guid(friendTransactionID.ToString());// fromAgentSession.UUID;
1682 msg.toAgentID = new System.Guid(user); // toAgentID.UUID; 1681 msg.toAgentID = new Guid(user); // toAgentID.UUID;
1683 msg.imSessionID = new System.Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 1682 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
1684 Console.WriteLine("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 1683 Console.WriteLine("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
1685 Console.WriteLine("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 1684 Console.WriteLine("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
1686 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 1685 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp;
@@ -2654,7 +2653,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2654 { 2653 {
2655 return new LSL_Types.Vector3(0, 0, 0); 2654 return new LSL_Types.Vector3(0, 0, 0);
2656 } 2655 }
2657 if (src.Data[index].GetType() == typeof(OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3)) 2656 if (src.Data[index].GetType() == typeof(LSL_Types.Vector3))
2658 { 2657 {
2659 return (LSL_Types.Vector3)src.Data[index]; 2658 return (LSL_Types.Vector3)src.Data[index];
2660 } 2659 }
@@ -2675,7 +2674,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2675 { 2674 {
2676 return new LSL_Types.Quaternion(0, 0, 0, 1); 2675 return new LSL_Types.Quaternion(0, 0, 0, 1);
2677 } 2676 }
2678 if (src.Data[index].GetType() == typeof(OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion)) 2677 if (src.Data[index].GetType() == typeof(LSL_Types.Quaternion))
2679 { 2678 {
2680 return (LSL_Types.Quaternion)src.Data[index]; 2679 return (LSL_Types.Quaternion)src.Data[index];
2681 } 2680 }
@@ -2713,11 +2712,11 @@ namespace OpenSim.Region.ScriptEngine.Common
2713 return 0; 2712 return 0;
2714 } 2713 }
2715 2714
2716 if (src.Data[index] is System.Int32) 2715 if (src.Data[index] is Int32)
2717 return 1; 2716 return 1;
2718 if (src.Data[index] is System.Double) 2717 if (src.Data[index] is Double)
2719 return 2; 2718 return 2;
2720 if (src.Data[index] is System.String) 2719 if (src.Data[index] is String)
2721 { 2720 {
2722 LLUUID tuuid; 2721 LLUUID tuuid;
2723 if (LLUUID.TryParse(src.Data[index].ToString(), out tuuid)) 2722 if (LLUUID.TryParse(src.Data[index].ToString(), out tuuid))
@@ -2729,11 +2728,11 @@ namespace OpenSim.Region.ScriptEngine.Common
2729 return 4; 2728 return 4;
2730 } 2729 }
2731 } 2730 }
2732 if (src.Data[index] is OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3) 2731 if (src.Data[index] is LSL_Types.Vector3)
2733 return 5; 2732 return 5;
2734 if (src.Data[index] is OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion) 2733 if (src.Data[index] is LSL_Types.Quaternion)
2735 return 6; 2734 return 6;
2736 if (src.Data[index] is OpenSim.Region.ScriptEngine.Common.LSL_Types.list) 2735 if (src.Data[index] is LSL_Types.list)
2737 return 7; 2736 return 7;
2738 return 0; 2737 return 0;
2739 2738
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index 8d8e0bc..fa957bb 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -25,7 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Collections.Generic; 28using OpenSim.Region.Environment.Interfaces;
29 29
30namespace OpenSim.Region.ScriptEngine.Common 30namespace OpenSim.Region.ScriptEngine.Common
31{ 31{
@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Common
35 35
36 string State { get; set; } 36 string State { get; set; }
37 37
38 OpenSim.Region.Environment.Interfaces.ICommander GetCommander(string name); 38 ICommander GetCommander(string name);
39 39
40 double llSin(double f); 40 double llSin(double f);
41 double llCos(double f); 41 double llCos(double f);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index 55c13a4..7a8b4ca 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -26,8 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text.RegularExpressions;
30using System.Collections; 29using System.Collections;
30using System.Text.RegularExpressions;
31 31
32namespace OpenSim.Region.ScriptEngine.Common 32namespace OpenSim.Region.ScriptEngine.Common
33{ 33{
@@ -639,7 +639,7 @@ namespace OpenSim.Region.ScriptEngine.Common
639 public double GeometricMean() 639 public double GeometricMean()
640 { 640 {
641 double ret = 1.0; 641 double ret = 1.0;
642 list nums = list.ToDoubleList(this); 642 list nums = ToDoubleList(this);
643 for (int i = 0; i < nums.Data.Length; i++) 643 for (int i = 0; i < nums.Data.Length; i++)
644 { 644 {
645 ret *= (double)nums.Data[i]; 645 ret *= (double)nums.Data[i];
@@ -650,7 +650,7 @@ namespace OpenSim.Region.ScriptEngine.Common
650 public double HarmonicMean() 650 public double HarmonicMean()
651 { 651 {
652 double ret = 0.0; 652 double ret = 0.0;
653 list nums = list.ToDoubleList(this); 653 list nums = ToDoubleList(this);
654 for (int i = 0; i < nums.Data.Length; i++) 654 for (int i = 0; i < nums.Data.Length; i++)
655 { 655 {
656 ret += 1.0 / (double)nums.Data[i]; 656 ret += 1.0 / (double)nums.Data[i];
@@ -661,7 +661,7 @@ namespace OpenSim.Region.ScriptEngine.Common
661 public double Variance() 661 public double Variance()
662 { 662 {
663 double s = 0; 663 double s = 0;
664 list num = list.ToDoubleList(this); 664 list num = ToDoubleList(this);
665 for (int i = 0; i < num.Data.Length; i++) 665 for (int i = 0; i < num.Data.Length; i++)
666 { 666 {
667 s += Math.Pow((double)num.Data[i], 2); 667 s += Math.Pow((double)num.Data[i], 2);
@@ -701,7 +701,7 @@ namespace OpenSim.Region.ScriptEngine.Common
701 output = "["; 701 output = "[";
702 foreach (object o in m_data) 702 foreach (object o in m_data)
703 { 703 {
704 if (o is System.String) 704 if (o is String)
705 { 705 {
706 output = output + "\"" + o + "\", "; 706 output = output + "\"" + o + "\", ";
707 } 707 }
@@ -837,7 +837,7 @@ namespace OpenSim.Region.ScriptEngine.Common
837 837
838 #region Operators 838 #region Operators
839 839
840 static public implicit operator System.Boolean(key k) 840 static public implicit operator Boolean(key k)
841 { 841 {
842 if (k.value.Length == 0) 842 if (k.value.Length == 0)
843 { 843 {
@@ -864,7 +864,7 @@ namespace OpenSim.Region.ScriptEngine.Common
864 return new key(s); 864 return new key(s);
865 } 865 }
866 866
867 static public implicit operator System.String(key k) 867 static public implicit operator String(key k)
868 { 868 {
869 return k.value; 869 return k.value;
870 } 870 }
@@ -917,7 +917,7 @@ namespace OpenSim.Region.ScriptEngine.Common
917 #endregion 917 #endregion
918 918
919 #region Operators 919 #region Operators
920 static public implicit operator System.Boolean(LSLString s) 920 static public implicit operator Boolean(LSLString s)
921 { 921 {
922 if (s.m_string.Length == 0) 922 if (s.m_string.Length == 0)
923 { 923 {
@@ -929,7 +929,7 @@ namespace OpenSim.Region.ScriptEngine.Common
929 } 929 }
930 } 930 }
931 931
932 static public implicit operator System.String(LSLString s) 932 static public implicit operator String(LSLString s)
933 { 933 {
934 return s.m_string; 934 return s.m_string;
935 } 935 }
@@ -1017,12 +1017,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1017 } 1017 }
1018 1018
1019 #endregion 1019 #endregion
1020 static public implicit operator System.Int32(LSLInteger i) 1020 static public implicit operator Int32(LSLInteger i)
1021 { 1021 {
1022 return i.value; 1022 return i.value;
1023 } 1023 }
1024 1024
1025 static public implicit operator System.Boolean(LSLInteger i) 1025 static public implicit operator Boolean(LSLInteger i)
1026 { 1026 {
1027 if (i.value == 0) 1027 if (i.value == 0)
1028 { 1028 {
@@ -1086,7 +1086,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1086 1086
1087 #region Operators 1087 #region Operators
1088 1088
1089 static public implicit operator System.Double(LSLFloat f) 1089 static public implicit operator Double(LSLFloat f)
1090 { 1090 {
1091 return f.value; 1091 return f.value;
1092 } 1092 }
@@ -1097,7 +1097,7 @@ namespace OpenSim.Region.ScriptEngine.Common
1097 //} 1097 //}
1098 1098
1099 1099
1100 static public implicit operator System.Boolean(LSLFloat f) 1100 static public implicit operator Boolean(LSLFloat f)
1101 { 1101 {
1102 if (f.value == 0) 1102 if (f.value == 0)
1103 { 1103 {
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
index de19f4e..b919f8d 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
@@ -25,21 +25,13 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System;
28using System.Collections;
29using System.Collections.Generic;
30using System.Runtime.Remoting.Lifetime;
31using System.Text;
32using System.Threading;
33using Axiom.Math; 28using Axiom.Math;
34using libsecondlife; 29using libsecondlife;
35using OpenSim.Framework; 30using Nini.Config;
36using OpenSim.Framework.Communications; 31using OpenSim.Framework.Console;
37using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
39using OpenSim.Region.ScriptEngine.Common; 34
40using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
41using OpenSim.Region.Environment;
42using OpenSim.Region.Environment.Modules.LandManagement;
43//using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL; 35//using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL;
44 36
45namespace OpenSim.Region.ScriptEngine.Common 37namespace OpenSim.Region.ScriptEngine.Common
@@ -408,7 +400,7 @@ namespace OpenSim.Region.ScriptEngine.Common
408 public bool osConsoleCommand(string command) 400 public bool osConsoleCommand(string command)
409 { 401 {
410 m_host.AddScriptLPS(1); 402 m_host.AddScriptLPS(1);
411 Nini.Config.IConfigSource config = new Nini.Config.IniConfigSource(Application.iniFilePath); 403 IConfigSource config = new IniConfigSource(Application.iniFilePath);
412 if (config.Configs["LL-Functions"] == null) 404 if (config.Configs["LL-Functions"] == null)
413 config.AddConfig("LL-Functions"); 405 config.AddConfig("LL-Functions");
414 406
@@ -416,7 +408,7 @@ namespace OpenSim.Region.ScriptEngine.Common
416 { 408 {
417 if (World.PermissionsMngr.CanRunConsoleCommand(m_host.OwnerID)) 409 if (World.PermissionsMngr.CanRunConsoleCommand(m_host.OwnerID))
418 { 410 {
419 OpenSim.Framework.Console.MainConsole.Instance.RunCommand(command); 411 MainConsole.Instance.RunCommand(command);
420 return true; 412 return true;
421 } 413 }
422 return false; 414 return false;
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs
index 3102e3f..a4dd3b0 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands_Interface.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Region.ScriptEngine.Common 28namespace OpenSim.Region.ScriptEngine.Common
33{ 29{
34 public interface OSSL_BuilIn_Commands_Interface 30 public interface OSSL_BuilIn_Commands_Interface
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
index 41100c9..262d75f 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AppDomainManager.cs
@@ -29,7 +29,6 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenSim.Region.ScriptEngine.Common;
33 32
34namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 33namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
35{ 34{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs
index a1bb5c9..7dad7ee 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs
@@ -25,16 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections; 28using System.Collections;
30using System.Collections.Generic;
31using System.Threading; 29using System.Threading;
32using libsecondlife; 30using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins; 33using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins;
39using Timer=OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins.Timer; 34using Timer=OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins.Timer;
40 35
@@ -50,11 +45,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
50 45
51 public ScriptEngine m_ScriptEngine; 46 public ScriptEngine m_ScriptEngine;
52 47
53 public AsyncCommandPlugins.Timer m_Timer; 48 public Timer m_Timer;
54 public AsyncCommandPlugins.HttpRequest m_HttpRequest; 49 public HttpRequest m_HttpRequest;
55 public AsyncCommandPlugins.Listener m_Listener; 50 public Listener m_Listener;
56 public AsyncCommandPlugins.SensorRepeat m_SensorRepeat; 51 public SensorRepeat m_SensorRepeat;
57 public AsyncCommandPlugins.XmlRequest m_XmlRequest; 52 public XmlRequest m_XmlRequest;
58 53
59 public AsyncCommandManager(ScriptEngine _ScriptEngine) 54 public AsyncCommandManager(ScriptEngine _ScriptEngine)
60 { 55 {
@@ -81,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
81 cmdHandlerThread.Priority = ThreadPriority.BelowNormal; 76 cmdHandlerThread.Priority = ThreadPriority.BelowNormal;
82 cmdHandlerThread.IsBackground = true; 77 cmdHandlerThread.IsBackground = true;
83 cmdHandlerThread.Start(); 78 cmdHandlerThread.Start();
84 OpenSim.Framework.ThreadTracker.Add(cmdHandlerThread); 79 ThreadTracker.Add(cmdHandlerThread);
85 } 80 }
86 } 81 }
87 82
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs
index d62734f..521402e 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs
@@ -26,16 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules; 30using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework;
38using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins;
39 31
40namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 32namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
41{ 33{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs
index 00cbd8c..874a905 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs
@@ -25,16 +25,8 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules; 29using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework;
38 30
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 31namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
40{ 32{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
index fd8dbd1..71ae80c 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
@@ -26,15 +26,10 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Threading;
32using libsecondlife; 30using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes;
38 33
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 34namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
40{ 35{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs
index 63a8d19..141e471 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs
@@ -28,13 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife; 31using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework;
38 32
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 33namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
40{ 34{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs
index be4f418..c3e1804 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife;
33using Axiom.Math;
34using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules; 30using OpenSim.Region.Environment.Modules;
36using OpenSim.Region.Environment.Scenes;
37using OpenSim.Framework;
38 31
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins 32namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins
40{ 33{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
index 2f2b384..b4789a9 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
35 /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it. 35 /// Prepares events so they can be directly executed upon a script by EventQueueManager, then queues it.
36 /// </summary> 36 /// </summary>
37 [Serializable] 37 [Serializable]
38 public class EventManager : OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.RemoteEvents, iScriptEngineFunctionModule 38 public class EventManager : ScriptServerInterfaces.RemoteEvents, iScriptEngineFunctionModule
39 { 39 {
40 // 40 //
41 // Class is instanced in "ScriptEngine" and Uses "EventQueueManager" that is also instanced in "ScriptEngine". 41 // Class is instanced in "ScriptEngine" and Uses "EventQueueManager" that is also instanced in "ScriptEngine".
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index cd03699..7cbbd4f 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -28,10 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Threading;
32using libsecondlife; 31using libsecondlife;
33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes.Scripting;
35 32
36namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 33namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
37{ 34{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index b8d950a..d77f698 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -27,11 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using System.Threading; 30using System.Threading;
33using libsecondlife; 31using libsecondlife;
34using Nini.Config;
35using OpenSim.Framework; 32using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes.Scripting; 33using OpenSim.Region.Environment.Scenes.Scripting;
37 34
@@ -123,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
123 EventQueueThread.Priority = MyThreadPriority; 120 EventQueueThread.Priority = MyThreadPriority;
124 EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount; 121 EventQueueThread.Name = "EventQueueManagerThread_" + ThreadCount;
125 EventQueueThread.Start(); 122 EventQueueThread.Start();
126 OpenSim.Framework.ThreadTracker.Add(EventQueueThread); 123 ThreadTracker.Add(EventQueueThread);
127 124
128 // Look at this... Don't you wish everyone did that solid coding everywhere? :P 125 // Look at this... Don't you wish everyone did that solid coding everywhere? :P
129 if (ThreadCount == int.MaxValue) 126 if (ThreadCount == int.MaxValue)
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
index ad41e5b..2bf0e41 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
@@ -27,9 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using System.Threading; 30using System.Threading;
31using OpenSim.Framework;
33 32
34namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 33namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
35{ 34{
@@ -94,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
94 MaintenanceThreadThread.Name = "ScriptMaintenanceThread"; 93 MaintenanceThreadThread.Name = "ScriptMaintenanceThread";
95 MaintenanceThreadThread.IsBackground = true; 94 MaintenanceThreadThread.IsBackground = true;
96 MaintenanceThreadThread.Start(); 95 MaintenanceThreadThread.Start();
97 OpenSim.Framework.ThreadTracker.Add(MaintenanceThreadThread); 96 ThreadTracker.Add(MaintenanceThreadThread);
98 } 97 }
99 } 98 }
100 99
@@ -144,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
144 { 143 {
145 while (true) 144 while (true)
146 { 145 {
147 System.Threading.Thread.Sleep(MaintenanceLoopms); // Sleep before next pass 146 Thread.Sleep(MaintenanceLoopms); // Sleep before next pass
148 147
149 // Reset counters? 148 // Reset counters?
150 if (MaintenanceLoopTicks_ScriptLoadUnload_ResetCount) 149 if (MaintenanceLoopTicks_ScriptLoadUnload_ResetCount)
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
index 02e49a2..a7ad50d 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs
@@ -27,13 +27,11 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.Reflection;
31using log4net;
31using Nini.Config; 32using Nini.Config;
32using OpenSim.Framework.Console;
33using OpenSim.Region.Environment.Interfaces; 33using OpenSim.Region.Environment.Interfaces;
34using OpenSim.Region.Environment.Scenes; 34using OpenSim.Region.Environment.Scenes;
35using OpenSim.Region.ScriptEngine.Common;
36using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
37 35
38namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 36namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
39{ 37{
@@ -42,9 +40,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
42 /// </summary> 40 /// </summary>
43 /// 41 ///
44 [Serializable] 42 [Serializable]
45 public abstract class ScriptEngine : IRegionModule, OpenSim.Region.ScriptEngine.Common.ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule 43 public abstract class ScriptEngine : IRegionModule, ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule
46 { 44 {
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 46
49 public static List<ScriptEngine> ScriptEngines = new List<ScriptEngine>(); 47 public static List<ScriptEngine> ScriptEngines = new List<ScriptEngine>();
50 public Scene World; 48 public Scene World;
@@ -75,7 +73,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
75 73
76 public abstract ScriptManager _GetScriptManager(); 74 public abstract ScriptManager _GetScriptManager();
77 75
78 public log4net.ILog Log 76 public ILog Log
79 { 77 {
80 get { return m_log; } 78 get { return m_log; }
81 } 79 }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index 09f84d6..cd2e530 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -32,9 +32,7 @@ using System.Reflection;
32using System.Runtime.Serialization.Formatters.Binary; 32using System.Runtime.Serialization.Formatters.Binary;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using libsecondlife;
35using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
37using OpenSim.Region.ScriptEngine.Common;
38 36
39namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 37namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
40{ 38{
@@ -106,9 +104,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
106 104
107 #region Object init/shutdown 105 #region Object init/shutdown
108 106
109 public ScriptEngineBase.ScriptEngine m_scriptEngine; 107 public ScriptEngine m_scriptEngine;
110 108
111 public ScriptManager(ScriptEngineBase.ScriptEngine scriptEngine) 109 public ScriptManager(ScriptEngine scriptEngine)
112 { 110 {
113 m_scriptEngine = scriptEngine; 111 m_scriptEngine = scriptEngine;
114 } 112 }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs
index 4e037b3..768ba6d 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/iScriptEngineFunctionModule.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase 28namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
33{ 29{
34 public interface iScriptEngineFunctionModule 30 public interface iScriptEngineFunctionModule
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
index 6110251..1119fe8 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptServerInterfaces.cs
@@ -28,7 +28,6 @@
28using libsecondlife; 28using libsecondlife;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Console;
32using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
33using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; 32using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
34 33
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs
index 6fe6381..14c6078 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/MyBase.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Region.ScriptEngine.Common.TRPC 28namespace OpenSim.Region.ScriptEngine.Common.TRPC
33{ 29{
34 class MyBase 30 class MyBase
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs
index 7689d69..624c3bb 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPClient.cs
@@ -25,12 +25,10 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Diagnostics; 29using System.Diagnostics;
31using System.Net; 30using System.Net;
32using System.Net.Sockets; 31using System.Net.Sockets;
33using System.Text;
34 32
35namespace OpenSim.Region.ScriptEngine.Common.TRPC 33namespace OpenSim.Region.ScriptEngine.Common.TRPC
36{ 34{
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs
index 521d75b..ab9d9b4 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPCommon.cs
@@ -25,11 +25,13 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Net;
29
28namespace OpenSim.Region.ScriptEngine.Common.TRPC 30namespace OpenSim.Region.ScriptEngine.Common.TRPC
29{ 31{
30 public class TCPCommon 32 public class TCPCommon
31 { 33 {
32 public delegate void ClientConnectedDelegate(int ID, System.Net.EndPoint Remote); 34 public delegate void ClientConnectedDelegate(int ID, EndPoint Remote);
33 public delegate void DataReceivedDelegate(int ID, byte[] data, int offset, int length); 35 public delegate void DataReceivedDelegate(int ID, byte[] data, int offset, int length);
34 public delegate void DataSentDelegate(int ID, int length); 36 public delegate void DataSentDelegate(int ID, int length);
35 public delegate void CloseDelegate(int ID); 37 public delegate void CloseDelegate(int ID);
@@ -46,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Common.TRPC
46 48
47 public interface ClientInterface : ServerAndClientInterface 49 public interface ClientInterface : ServerAndClientInterface
48 { 50 {
49 event TCPCommon.ConnectErrorDelegate ConnectError; 51 event ConnectErrorDelegate ConnectError;
50 void Connect(string RemoteHost, int RemotePort); 52 void Connect(string RemoteHost, int RemotePort);
51 void Disconnect(int ID); 53 void Disconnect(int ID);
52 } 54 }
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs
index 5d1e53a..55a20e7 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC/TCPServer.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
30using System.Diagnostics; 30using System.Diagnostics;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using TCPCommon=OpenSim.Region.ScriptEngine.Common.TRPC.TCPCommon;
34 33
35namespace OpenSim.Region.ScriptEngine.Common.TRPC 34namespace OpenSim.Region.ScriptEngine.Common.TRPC
36{ 35{
diff --git a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
index 4567e60..013ae0f 100644
--- a/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
+++ b/OpenSim/Region/ScriptEngine/Common/TRPC_Remote.cs
@@ -28,7 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; 30using System.Diagnostics;
31using System.Net;
31using System.Text; 32using System.Text;
33using System.Web;
32using libsecondlife; 34using libsecondlife;
33using OpenSim.Region.ScriptEngine.Common.TRPC; 35using OpenSim.Region.ScriptEngine.Common.TRPC;
34 36
@@ -41,24 +43,24 @@ namespace OpenSim.Region.ScriptEngine.Common
41 43
42 public delegate void ReceiveCommandDelegate(int ID, string Command, params object[] p); 44 public delegate void ReceiveCommandDelegate(int ID, string Command, params object[] p);
43 public event ReceiveCommandDelegate ReceiveCommand; 45 public event ReceiveCommandDelegate ReceiveCommand;
44 System.Collections.Generic.Dictionary<string, Type> TypeDictionary = new Dictionary<string, Type>(); 46 Dictionary<string, Type> TypeDictionary = new Dictionary<string, Type>();
45 Type[] Types = 47 Type[] Types =
46 { 48 {
47 typeof(System.String), 49 typeof(String),
48 typeof(System.Int16), 50 typeof(Int16),
49 typeof(System.Int32), 51 typeof(Int32),
50 typeof(System.Int64), 52 typeof(Int64),
51 typeof(System.Double), 53 typeof(Double),
52 typeof(System.Decimal), 54 typeof(Decimal),
53 typeof(System.Array), 55 typeof(Array),
54 typeof(LLUUID), 56 typeof(LLUUID),
55 typeof(System.UInt16), 57 typeof(UInt16),
56 typeof(System.UInt32), 58 typeof(UInt32),
57 typeof(System.UInt64) 59 typeof(UInt64)
58 }; 60 };
59 61
60 // TODO: Maybe we should move queue into TCPSocket so we won't have to keep one queue instance per connection 62 // TODO: Maybe we should move queue into TCPSocket so we won't have to keep one queue instance per connection
61 private System.Collections.Generic.Dictionary<int, InQueueStruct> InQueue = new Dictionary<int, InQueueStruct>(); 63 private Dictionary<int, InQueueStruct> InQueue = new Dictionary<int, InQueueStruct>();
62 private class InQueueStruct 64 private class InQueueStruct
63 { 65 {
64 public byte[] Queue; 66 public byte[] Queue;
@@ -81,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Common
81 } 83 }
82 } 84 }
83 85
84 void TCPS_ClientConnected(int ID, System.Net.EndPoint Remote) 86 void TCPS_ClientConnected(int ID, EndPoint Remote)
85 { 87 {
86 // Create a incoming queue for this connection 88 // Create a incoming queue for this connection
87 InQueueStruct iq = new InQueueStruct(); 89 InQueueStruct iq = new InQueueStruct();
@@ -165,7 +167,7 @@ namespace OpenSim.Region.ScriptEngine.Common
165 for (int i = 1; i < parts.Length; i++) 167 for (int i = 1; i < parts.Length; i++)
166 { 168 {
167 string[] spl; 169 string[] spl;
168 spl = System.Web.HttpUtility.UrlDecode(parts[i]).Split('|'); 170 spl = HttpUtility.UrlDecode(parts[i]).Split('|');
169 string t = spl[0]; 171 string t = spl[0];
170 param[i - 1] = Convert.ChangeType(spl[1], TypeLookup(t)); 172 param[i - 1] = Convert.ChangeType(spl[1], TypeLookup(t));
171 } 173 }
@@ -192,7 +194,7 @@ namespace OpenSim.Region.ScriptEngine.Common
192 string tmpStr = Command; 194 string tmpStr = Command;
193 for (int i = 0; i < p.Length; i++) 195 for (int i = 0; i < p.Length; i++)
194 { 196 {
195 tmpStr += "," + p[i].GetType().ToString() + "|" + System.Web.HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44") 197 tmpStr += "," + p[i].GetType().ToString() + "|" + HttpUtility.UrlEncode(p[i].ToString()); // .Replace(",", "%44")
196 } 198 }
197 tmpStr += "\n"; 199 tmpStr += "\n";
198 byte[] byteData = Encoding.ASCII.GetBytes(tmpStr); 200 byte[] byteData = Encoding.ASCII.GetBytes(tmpStr);
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index e3013c9..fc38ef2 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -30,10 +30,10 @@ using System.CodeDom.Compiler;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Globalization; 31using System.Globalization;
32using System.IO; 32using System.IO;
33using System.Reflection;
34using Microsoft.CSharp; 33using Microsoft.CSharp;
35using Microsoft.VisualBasic;
36using Microsoft.JScript; 34using Microsoft.JScript;
35using Microsoft.VisualBasic;
36using OpenSim.Region.Environment.Interfaces;
37 37
38namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL 38namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
39{ 39{
@@ -62,8 +62,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
62 private bool WriteScriptSourceToDebugFile; 62 private bool WriteScriptSourceToDebugFile;
63 private bool CompileWithDebugInformation; 63 private bool CompileWithDebugInformation;
64 private bool CleanUpOldScriptsOnStartup; 64 private bool CleanUpOldScriptsOnStartup;
65 private System.Collections.Generic.Dictionary<string, Boolean> AllowedCompilers = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase); 65 private Dictionary<string, bool> AllowedCompilers = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase);
66 private System.Collections.Generic.Dictionary<string, enumCompileType> LanguageMapping = new Dictionary<string, enumCompileType>(StringComparer.CurrentCultureIgnoreCase); 66 private Dictionary<string, enumCompileType> LanguageMapping = new Dictionary<string, enumCompileType>(StringComparer.CurrentCultureIgnoreCase);
67 67
68 private string FilePrefix; 68 private string FilePrefix;
69 private string ScriptEnginesPath = "ScriptEngines"; 69 private string ScriptEnginesPath = "ScriptEngines";
@@ -276,7 +276,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
276 if (enableCommanderLSL == true && l == enumCompileType.cs) 276 if (enableCommanderLSL == true && l == enumCompileType.cs)
277 { 277 {
278 foreach (KeyValuePair<string, 278 foreach (KeyValuePair<string,
279 OpenSim.Region.Environment.Interfaces.ICommander> com 279 ICommander> com
280 in m_scriptEngine.World.GetCommanders()) 280 in m_scriptEngine.World.GetCommanders())
281 { 281 {
282 compileScript = com.Value.GenerateRuntimeAPI() + compileScript; 282 compileScript = com.Value.GenerateRuntimeAPI() + compileScript;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 20c108d..0025b26 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -26,9 +26,9 @@
26* 26*
27*/ 27*/
28 28
29using System;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Text.RegularExpressions; 31using System.Text.RegularExpressions;
31using System;
32 32
33namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL 33namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
34{ 34{
@@ -61,7 +61,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
61 public string Convert(string Script) 61 public string Convert(string Script)
62 { 62 {
63 quotes.Clear(); 63 quotes.Clear();
64 string Return = System.String.Empty; 64 string Return = String.Empty;
65 Script = " \r\n" + Script; 65 Script = " \r\n" + Script;
66 66
67 // 67 //
@@ -77,12 +77,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
77 // temporarily replace quotes so we can work our magic on the script without 77 // temporarily replace quotes so we can work our magic on the script without
78 // always considering if we are inside our outside quotes's 78 // always considering if we are inside our outside quotes's
79 // TODO: Does this work on half-quotes in strings? ;) 79 // TODO: Does this work on half-quotes in strings? ;)
80 string _Script = System.String.Empty; 80 string _Script = String.Empty;
81 string C; 81 string C;
82 bool in_quote = false; 82 bool in_quote = false;
83 bool quote_replaced = false; 83 bool quote_replaced = false;
84 string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_"; 84 string quote_replacement_string = "Q_U_O_T_E_REPLACEMENT_";
85 string quote = System.String.Empty; 85 string quote = String.Empty;
86 bool last_was_escape = false; 86 bool last_was_escape = false;
87 int quote_replaced_count = 0; 87 int quote_replaced_count = 0;
88 for (int p = 0; p < Script.Length; p++) 88 for (int p = 0; p < Script.Length; p++)
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
101 } 101 }
102 else 102 else
103 { 103 {
104 if (quote == System.String.Empty) 104 if (quote == String.Empty)
105 { 105 {
106 // We didn't replace quote, probably because of empty string? 106 // We didn't replace quote, probably because of empty string?
107 _Script += quote_replacement_string + 107 _Script += quote_replacement_string +
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
111 quotes.Add( 111 quotes.Add(
112 quote_replacement_string + 112 quote_replacement_string +
113 quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote); 113 quote_replaced_count.ToString().PadLeft(5, "0".ToCharArray()[0]), quote);
114 quote = System.String.Empty; 114 quote = String.Empty;
115 } 115 }
116 break; 116 break;
117 } 117 }
@@ -155,10 +155,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
155 // 155 //
156 int ilevel = 0; 156 int ilevel = 0;
157 int lastlevel = 0; 157 int lastlevel = 0;
158 string ret = System.String.Empty; 158 string ret = String.Empty;
159 string cache = System.String.Empty; 159 string cache = String.Empty;
160 bool in_state = false; 160 bool in_state = false;
161 string current_statename = System.String.Empty; 161 string current_statename = String.Empty;
162 for (int p = 0; p < Script.Length; p++) 162 for (int p = 0; p < Script.Length; p++)
163 { 163 {
164 C = Script.Substring(p, 1); 164 C = Script.Substring(p, 1);
@@ -319,9 +319,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
319 { 319 {
320 state_events.Add(statea, convertnametoFlag(eventa)); 320 state_events.Add(statea, convertnametoFlag(eventa));
321 } 321 }
322 System.Console.WriteLine("State:" + statea + ", event: " + eventa); 322 Console.WriteLine("State:" + statea + ", event: " + eventa);
323 } 323 }
324 System.Console.WriteLine("Matches:" + eventmatches.GetUpperBound(0)); 324 Console.WriteLine("Matches:" + eventmatches.GetUpperBound(0));
325 // Add namespace, class name and inheritance 325 // Add namespace, class name and inheritance
326 326
327 // Looking *ONLY* for state entry events 327 // Looking *ONLY* for state entry events
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 6f2dbad..99efed3 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -28,13 +28,12 @@
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System; 29using System;
30using Nini.Config; 30using Nini.Config;
31using OpenSim.Framework.Console;
32using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
33 32
34namespace OpenSim.Region.ScriptEngine.DotNetEngine 33namespace OpenSim.Region.ScriptEngine.DotNetEngine
35{ 34{
36 [Serializable] 35 [Serializable]
37 public class ScriptEngine : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptEngine 36 public class ScriptEngine : Common.ScriptEngineBase.ScriptEngine
38 { 37 {
39 // We need to override a few things for our DotNetEngine 38 // We need to override a few things for our DotNetEngine
40 public override void Initialise(Scene scene, IConfigSource config) 39 public override void Initialise(Scene scene, IConfigSource config)
@@ -43,7 +42,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
43 InitializeEngine(scene, config, true, GetScriptManager()); 42 InitializeEngine(scene, config, true, GetScriptManager());
44 } 43 }
45 44
46 public override OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager _GetScriptManager() 45 public override Common.ScriptEngineBase.ScriptManager _GetScriptManager()
47 { 46 {
48 return new ScriptManager(this); 47 return new ScriptManager(this);
49 } 48 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 05a2d06..e242748 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -34,7 +34,7 @@ using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
34 34
35namespace OpenSim.Region.ScriptEngine.DotNetEngine 35namespace OpenSim.Region.ScriptEngine.DotNetEngine
36{ 36{
37 public class ScriptManager : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager 37 public class ScriptManager : Common.ScriptEngineBase.ScriptManager
38 { 38 {
39 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine) 39 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine)
40 : base(scriptEngine) 40 : base(scriptEngine)
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
index 54328ff..0208350 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/Engine.cs
@@ -33,7 +33,6 @@ using System.Reflection.Emit;
33using System.Text; 33using System.Text;
34using System.Threading; 34using System.Threading;
35using OpenSim.Region.ScriptEngine.Common; 35using OpenSim.Region.ScriptEngine.Common;
36using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
37 36
38namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 37namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
39{ 38{
@@ -59,11 +58,11 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
59 string DLL_FileName = asmName.Name + ".dll"; 58 string DLL_FileName = asmName.Name + ".dll";
60 string DLL_FileName_WithPath = Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName; 59 string DLL_FileName_WithPath = Path.GetDirectoryName(LSO_FileName) + @"\" + DLL_FileName;
61 60
62 LSOEngine.LSO.Common.SendToLog("LSO File Name: " + Path.GetFileName(LSO_FileName)); 61 Common.SendToLog("LSO File Name: " + Path.GetFileName(LSO_FileName));
63 LSOEngine.LSO.Common.SendToLog("Assembly name: " + asmName.Name); 62 Common.SendToLog("Assembly name: " + asmName.Name);
64 LSOEngine.LSO.Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll"); 63 Common.SendToLog("Assembly File Name: " + asmName.Name + ".dll");
65 LSOEngine.LSO.Common.SendToLog("Starting processing of LSL ByteCode..."); 64 Common.SendToLog("Starting processing of LSL ByteCode...");
66 LSOEngine.LSO.Common.SendToLog(String.Empty); 65 Common.SendToLog(String.Empty);
67 66
68 67
69 // Create Assembly 68 // Create Assembly
@@ -104,7 +103,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
104 LSOP.Parse(); 103 LSOP.Parse();
105 104
106 // Constructor has to be created AFTER LSO_Parser because of accumulated variables 105 // Constructor has to be created AFTER LSO_Parser because of accumulated variables
107 if (LSOEngine.LSO.Common.IL_CreateConstructor) 106 if (Common.IL_CreateConstructor)
108 IL_CREATE_CONSTRUCTOR(typeBuilder, LSOP); 107 IL_CREATE_CONSTRUCTOR(typeBuilder, LSOP);
109 108
110 LSOP.CloseFile(); 109 LSOP.CloseFile();
@@ -113,15 +112,15 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
113 */ 112 */
114 113
115 114
116 LSOEngine.LSO.Common.SendToLog("Attempting to compile assembly..."); 115 Common.SendToLog("Attempting to compile assembly...");
117 // Compile it 116 // Compile it
118 Type type = typeBuilder.CreateType(); 117 Type type = typeBuilder.CreateType();
119 LSOEngine.LSO.Common.SendToLog("Compilation successful!"); 118 Common.SendToLog("Compilation successful!");
120 119
121 LSOEngine.LSO.Common.SendToLog("Saving assembly: " + DLL_FileName); 120 Common.SendToLog("Saving assembly: " + DLL_FileName);
122 asmBuilder.Save(DLL_FileName); 121 asmBuilder.Save(DLL_FileName);
123 122
124 LSOEngine.LSO.Common.SendToLog("Returning assembly filename: " + DLL_FileName); 123 Common.SendToLog("Returning assembly filename: " + DLL_FileName);
125 124
126 125
127 return DLL_FileName; 126 return DLL_FileName;
@@ -166,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
166 165
167 private static void IL_CREATE_CONSTRUCTOR(TypeBuilder typeBuilder, LSO_Parser LSOP) 166 private static void IL_CREATE_CONSTRUCTOR(TypeBuilder typeBuilder, LSO_Parser LSOP)
168 { 167 {
169 LSOEngine.LSO.Common.SendToDebug("IL_CREATE_CONSTRUCTOR()"); 168 Common.SendToDebug("IL_CREATE_CONSTRUCTOR()");
170 //ConstructorBuilder constructor = typeBuilder.DefineConstructor( 169 //ConstructorBuilder constructor = typeBuilder.DefineConstructor(
171 // MethodAttributes.Public, 170 // MethodAttributes.Public,
172 // CallingConventions.Standard, 171 // CallingConventions.Standard,
@@ -235,7 +234,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
235 Type datatype = null; 234 Type datatype = null;
236 235
237 // Push data to stack 236 // Push data to stack
238 LSOEngine.LSO.Common.SendToDebug("Adding to static (" + pos + ") type: " + 237 Common.SendToDebug("Adding to static (" + pos + ") type: " +
239 ((LSO_Enums.Variable_Type_Codes) sb.ObjectType).ToString() + " (" + sb.ObjectType + 238 ((LSO_Enums.Variable_Type_Codes) sb.ObjectType).ToString() + " (" + sb.ObjectType +
240 ")"); 239 ")");
241 switch ((LSO_Enums.Variable_Type_Codes) sb.ObjectType) 240 switch ((LSO_Enums.Variable_Type_Codes) sb.ObjectType)
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs
index 60d68f5..6d0e35c 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/IL_common_functions.cs
@@ -26,10 +26,6 @@
26 */ 26 */
27 27
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29using System;
30using System.Reflection;
31using System.Reflection.Emit;
32
33namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 29namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
34{ 30{
35 internal partial class LSO_Parser 31 internal partial class LSO_Parser
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs
index ad216aa..1b73311 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSL_BaseClass_OPCODES.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30
31namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 28namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
32{ 29{
33 //public partial class LSL_BaseClass 30 //public partial class LSL_BaseClass
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
index a110c28..e4a57e8 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
@@ -33,7 +33,6 @@ using System.IO;
33using System.Reflection; 33using System.Reflection;
34using System.Reflection.Emit; 34using System.Reflection.Emit;
35using System.Text; 35using System.Text;
36using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
37 36
38namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO 37namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
39{ 38{
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
index 3b5ca0f..f035c03 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSOScript.cs
@@ -25,10 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.IO;
31using System.Text;
32using OpenSim.Region.ScriptEngine.LSOEngine.LSO; 28using OpenSim.Region.ScriptEngine.LSOEngine.LSO;
33 29
34namespace OpenSim.Region.ScriptEngine.LSOEngine 30namespace OpenSim.Region.ScriptEngine.LSOEngine
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
index 8495037..3c0e9cd 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
@@ -27,18 +27,12 @@
27 27
28using System; 28using System;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Framework.Console;
31using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
33using OpenSim.Region.ScriptEngine.Common;
34using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
35using EventManager = OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.EventManager;
36using ScriptManager=OpenSim.Region.ScriptEngine.LSOEngine.ScriptManager;
37 31
38namespace OpenSim.Region.ScriptEngine.LSOEngine 32namespace OpenSim.Region.ScriptEngine.LSOEngine
39{ 33{
40 [Serializable] 34 [Serializable]
41 public class ScriptEngine : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptEngine 35 public class ScriptEngine : Common.ScriptEngineBase.ScriptEngine
42 { 36 {
43 // We need to override a few things for our DotNetEngine 37 // We need to override a few things for our DotNetEngine
44 public override void Initialise(Scene scene, IConfigSource config) 38 public override void Initialise(Scene scene, IConfigSource config)
@@ -46,7 +40,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
46 InitializeEngine(scene, config, true, GetScriptManager()); 40 InitializeEngine(scene, config, true, GetScriptManager());
47 } 41 }
48 42
49 public override OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager _GetScriptManager() 43 public override Common.ScriptEngineBase.ScriptManager _GetScriptManager()
50 { 44 {
51 return new ScriptManager(this); 45 return new ScriptManager(this);
52 } 46 }
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
index a933b08..0434f55 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
@@ -26,11 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
32using System.Runtime.Serialization.Formatters.Binary;
33using System.Threading;
34using libsecondlife; 29using libsecondlife;
35using OpenSim.Framework; 30using OpenSim.Framework;
36using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
@@ -39,7 +34,7 @@ using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
39 34
40namespace OpenSim.Region.ScriptEngine.LSOEngine 35namespace OpenSim.Region.ScriptEngine.LSOEngine
41{ 36{
42 public class ScriptManager : OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager 37 public class ScriptManager : Common.ScriptEngineBase.ScriptManager
43 { 38 {
44 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine) 39 public ScriptManager(Common.ScriptEngineBase.ScriptEngine scriptEngine)
45 : base(scriptEngine) 40 : base(scriptEngine)
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
index 2a2f24f..603808e 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/RemoteServer.cs
@@ -26,8 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Net.Sockets;
30using System.Text;
31using System.Runtime.Remoting; 30using System.Runtime.Remoting;
32using System.Runtime.Remoting.Channels; 31using System.Runtime.Remoting.Channels;
33using System.Runtime.Remoting.Channels.Tcp; 32using System.Runtime.Remoting.Channels.Tcp;
@@ -61,20 +60,20 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
61 // Use the object 60 // Use the object
62 if (obj.Equals(null)) 61 if (obj.Equals(null))
63 { 62 {
64 System.Console.WriteLine("Error: unable to locate server"); 63 Console.WriteLine("Error: unable to locate server");
65 } 64 }
66 else 65 else
67 { 66 {
68 return obj; 67 return obj;
69 } 68 }
70 } 69 }
71 catch (System.Net.Sockets.SocketException) 70 catch (SocketException)
72 { 71 {
73 System.Console.WriteLine("Error: unable to connect to server"); 72 Console.WriteLine("Error: unable to connect to server");
74 } 73 }
75 catch (System.Runtime.Remoting.RemotingException) 74 catch (RemotingException)
76 { 75 {
77 System.Console.WriteLine("Error: unable to connect to server"); 76 Console.WriteLine("Error: unable to connect to server");
78 } 77 }
79 return null; 78 return null;
80 } 79 }
diff --git a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
index 0995afb..c33cfd1 100644
--- a/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/RemoteServer/ScriptEngine.cs
@@ -28,8 +28,9 @@
28/* Original code: Tedd Hansen */ 28/* Original code: Tedd Hansen */
29 29
30using System; 30using System;
31using System.Reflection;
32using log4net;
31using Nini.Config; 33using Nini.Config;
32using OpenSim.Framework.Console;
33using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
34using OpenSim.Region.Environment.Scenes; 35using OpenSim.Region.Environment.Scenes;
35 36
@@ -42,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
42 [Serializable] 43 [Serializable]
43 public class ScriptEngine : IRegionModule 44 public class ScriptEngine : IRegionModule
44 { 45 {
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 47
47 internal Scene World; 48 internal Scene World;
48 internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim 49 internal EventManager m_EventManager; // Handles and queues incoming events from OpenSim
@@ -53,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.RemoteServer
53 Common.mySE = this; 54 Common.mySE = this;
54 } 55 }
55 56
56 public log4net.ILog Log 57 public ILog Log
57 { 58 {
58 get { return m_log; } 59 get { return m_log; }
59 } 60 }