aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJeff Ames2008-05-14 05:11:23 +0000
committerJeff Ames2008-05-14 05:11:23 +0000
commitc995d60d37032db3198b8496e186aa7a892dc7a8 (patch)
tree826147e66f61c812897d9b0acdb16ebfeb30d4d3 /OpenSim/Region/ScriptEngine
parent* Added 3 warnings in response to the warnings. Adam, read the warnings. (diff)
downloadopensim-SC_OLD-c995d60d37032db3198b8496e186aa7a892dc7a8.zip
opensim-SC_OLD-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.gz
opensim-SC_OLD-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.bz2
opensim-SC_OLD-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs86
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs42
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs22
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs2
8 files changed, 84 insertions, 80 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 4050f36..61b577e 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Region.ScriptEngine.Common
137 137
138 foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) 138 foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
139 { 139 {
140 if(inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) 140 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
141 { 141 {
142 invItemID=inv.Key; 142 invItemID=inv.Key;
143 break; 143 break;
@@ -152,9 +152,9 @@ namespace OpenSim.Region.ScriptEngine.Common
152 m_host.AddScriptLPS(1); 152 m_host.AddScriptLPS(1);
153 foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) 153 foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
154 { 154 {
155 if(inv.Value.Name == name) 155 if (inv.Value.Name == name)
156 { 156 {
157 if(inv.Value.Type != type) 157 if (inv.Value.Type != type)
158 return LLUUID.Zero; 158 return LLUUID.Zero;
159 159
160 return inv.Value.AssetID.ToString(); 160 return inv.Value.AssetID.ToString();
@@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Common
168 m_host.AddScriptLPS(1); 168 m_host.AddScriptLPS(1);
169 foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory) 169 foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
170 { 170 {
171 if(inv.Value.Name == name) 171 if (inv.Value.Name == name)
172 { 172 {
173 return inv.Value.AssetID.ToString(); 173 return inv.Value.AssetID.ToString();
174 } 174 }
@@ -362,11 +362,11 @@ namespace OpenSim.Region.ScriptEngine.Common
362 double x,y,z,s; 362 double x,y,z,s;
363 363
364 double c1 = Math.Cos(v.y / 2); 364 double c1 = Math.Cos(v.y / 2);
365 double s1 = Math.Sin(v.y / 2 ); 365 double s1 = Math.Sin(v.y / 2);
366 double c2 = Math.Cos(v.z / 2 ); 366 double c2 = Math.Cos(v.z / 2);
367 double s2 = Math.Sin(v.z / 2 ); 367 double s2 = Math.Sin(v.z / 2);
368 double c3 = Math.Cos(v.x / 2 ); 368 double c3 = Math.Cos(v.x / 2);
369 double s3 = Math.Sin(v.x / 2 ); 369 double s3 = Math.Sin(v.x / 2);
370 370
371 double c1c2 = c1 * c2; 371 double c1c2 = c1 * c2;
372 double s1s2 = s1 * s2; 372 double s1s2 = s1 * s2;
@@ -2900,7 +2900,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2900 { 2900 {
2901 rotation rot = llEuler2Rot(<0,70,0> * DEG_TO_RAD); 2901 rotation rot = llEuler2Rot(<0,70,0> * DEG_TO_RAD);
2902 2902
2903 llOwnerSay("to get here, we rotate over: "+ (string) llRot2Axis(rot) ); 2903 llOwnerSay("to get here, we rotate over: "+ (string) llRot2Axis(rot));
2904 llOwnerSay("and we rotate for: "+ (llRot2Angle(rot) * RAD_TO_DEG)); 2904 llOwnerSay("and we rotate for: "+ (llRot2Angle(rot) * RAD_TO_DEG));
2905 2905
2906 // convert back and forth between quaternion <-> vector and angle 2906 // convert back and forth between quaternion <-> vector and angle
@@ -3339,14 +3339,13 @@ namespace OpenSim.Region.ScriptEngine.Common
3339 if (src.Data.Length > 0) 3339 if (src.Data.Length > 0)
3340 { 3340 {
3341 ret = src.Data[x++].ToString(); 3341 ret = src.Data[x++].ToString();
3342 for(;x<src.Data.Length;x++) 3342 for (; x < src.Data.Length; x++)
3343 { 3343 {
3344 ret += ", "+src.Data[x].ToString(); 3344 ret += ", "+src.Data[x].ToString();
3345 } 3345 }
3346 } 3346 }
3347 3347
3348 return ret; 3348 return ret;
3349
3350 } 3349 }
3351 3350
3352 /// <summary> 3351 /// <summary>
@@ -3367,9 +3366,9 @@ namespace OpenSim.Region.ScriptEngine.Common
3367 3366
3368 m_host.AddScriptLPS(1); 3367 m_host.AddScriptLPS(1);
3369 3368
3370 for(int i=0; i<src.Length; i++) 3369 for (int i = 0; i < src.Length; i++)
3371 { 3370 {
3372 switch(src[i]) 3371 switch (src[i])
3373 { 3372 {
3374 case '<' : 3373 case '<' :
3375 parens++; 3374 parens++;
@@ -3435,15 +3434,14 @@ namespace OpenSim.Region.ScriptEngine.Common
3435 3434
3436 if (src.Length != stride && src.Length%stride == 0) 3435 if (src.Length != stride && src.Length%stride == 0)
3437 { 3436 {
3438
3439 chunkk = src.Length/stride; 3437 chunkk = src.Length/stride;
3440 3438
3441 chunks = new int[chunkk]; 3439 chunks = new int[chunkk];
3442 3440
3443 for(int i=0;i<chunkk;i++) 3441 for (int i = 0; i < chunkk; i++)
3444 chunks[i] = i; 3442 chunks[i] = i;
3445 3443
3446 for(int i=0; i<chunkk-1; i++) 3444 for (int i = 0; i < chunkk - 1; i++)
3447 { 3445 {
3448 // randomly select 2 chunks 3446 // randomly select 2 chunks
3449 index1 = rand.Next(rand.Next(65536)); 3447 index1 = rand.Next(rand.Next(65536));
@@ -3461,10 +3459,13 @@ namespace OpenSim.Region.ScriptEngine.Common
3461 3459
3462 result = new LSL_Types.list(); 3460 result = new LSL_Types.list();
3463 3461
3464 for(int i=0; i<chunkk; i++) 3462 for (int i = 0; i < chunkk; i++)
3465 for(int j=0;j<stride;j++) 3463 {
3464 for (int j = 0; j < stride; j++)
3465 {
3466 result.Add(src.Data[chunks[i]*stride+j]); 3466 result.Add(src.Data[chunks[i]*stride+j]);
3467 3467 }
3468 }
3468 } 3469 }
3469 else { 3470 else {
3470 object[] array = new object[src.Length]; 3471 object[] array = new object[src.Length];
@@ -3540,25 +3541,28 @@ namespace OpenSim.Region.ScriptEngine.Common
3540 stride = 1; 3541 stride = 1;
3541 3542
3542 if (stride > 0) 3543 if (stride > 0)
3543 for(int i=0;i<src.Length;i+=stride) 3544 {
3545 for (int i = 0; i < src.Length; i += stride)
3544 { 3546 {
3545 if (i<=ei[0] && i>=si[0]) 3547 if (i<=ei[0] && i>=si[0])
3546 result.Add(src.Data[i]); 3548 result.Add(src.Data[i]);
3547 if (twopass && i>=si[1] && i<=ei[1]) 3549 if (twopass && i>=si[1] && i<=ei[1])
3548 result.Add(src.Data[i]); 3550 result.Add(src.Data[i]);
3549 } 3551 }
3552 }
3550 else if (stride < 0) 3553 else if (stride < 0)
3551 for(int i=src.Length-1;i>=0;i+=stride) 3554 {
3555 for (int i = src.Length - 1; i >= 0; i += stride)
3552 { 3556 {
3553 if (i<=ei[0] && i>=si[0]) 3557 if (i <= ei[0] && i >= si[0])
3554 result.Add(src.Data[i]); 3558 result.Add(src.Data[i]);
3555 if (twopass && i>=si[1] && i<=ei[1]) 3559 if (twopass && i >= si[1] && i <= ei[1])
3556 result.Add(src.Data[i]); 3560 result.Add(src.Data[i]);
3557 } 3561 }
3562 }
3558 } 3563 }
3559 3564
3560 return result; 3565 return result;
3561
3562 } 3566 }
3563 3567
3564 public LSL_Types.Vector3 llGetRegionCorner() 3568 public LSL_Types.Vector3 llGetRegionCorner()
@@ -3635,12 +3639,12 @@ namespace OpenSim.Region.ScriptEngine.Common
3635 3639
3636 if (src.Length != 0 && test.Length != 0) 3640 if (src.Length != 0 && test.Length != 0)
3637 { 3641 {
3638 for(int i=0; i< length; i++) 3642 for (int i = 0; i < length; i++)
3639 { 3643 {
3640 if (src.Data[i].Equals(test.Data[0])) 3644 if (src.Data[i].Equals(test.Data[0]))
3641 { 3645 {
3642 int j; 3646 int j;
3643 for(j=1;j<test.Length;j++) 3647 for (j = 1; j < test.Length; j++)
3644 if (!src.Data[i+j].Equals(test.Data[j])) 3648 if (!src.Data[i+j].Equals(test.Data[j]))
3645 break; 3649 break;
3646 if (j == test.Length) 3650 if (j == test.Length)
@@ -4328,7 +4332,7 @@ namespace OpenSim.Region.ScriptEngine.Common
4328 return; 4332 return;
4329 } 4333 }
4330 string[] buts = new string[buttons.Length]; 4334 string[] buts = new string[buttons.Length];
4331 for(int i = 0; i < buttons.Length; i++) 4335 for (int i = 0; i < buttons.Length; i++)
4332 { 4336 {
4333 if (buttons.Data[i].ToString() == String.Empty) 4337 if (buttons.Data[i].ToString() == String.Empty)
4334 { 4338 {
@@ -4516,7 +4520,7 @@ namespace OpenSim.Region.ScriptEngine.Common
4516 int face; 4520 int face;
4517 LSL_Types.Vector3 v; 4521 LSL_Types.Vector3 v;
4518 4522
4519 switch(code) 4523 switch (code)
4520 { 4524 {
4521 case 6: // PRIM_POSITION 4525 case 6: // PRIM_POSITION
4522 if (remain < 1) 4526 if (remain < 1)
@@ -4826,12 +4830,12 @@ namespace OpenSim.Region.ScriptEngine.Common
4826 4830
4827 LSL_Types.list res = new LSL_Types.list(); 4831 LSL_Types.list res = new LSL_Types.list();
4828 int idx=0; 4832 int idx=0;
4829 while(idx < rules.Length) 4833 while (idx < rules.Length)
4830 { 4834 {
4831 int code=Convert.ToInt32(rules.Data[idx++]); 4835 int code=Convert.ToInt32(rules.Data[idx++]);
4832 int remain=rules.Length-idx; 4836 int remain=rules.Length-idx;
4833 4837
4834 switch(code) 4838 switch (code)
4835 { 4839 {
4836 case 2: // PRIM_MATERIAL 4840 case 2: // PRIM_MATERIAL
4837 res.Add(new LSL_Types.LSLInteger(m_host.Material)); 4841 res.Add(new LSL_Types.LSLInteger(m_host.Material));
@@ -5339,19 +5343,20 @@ namespace OpenSim.Region.ScriptEngine.Common
5339 5343
5340 // All entries are initially valid 5344 // All entries are initially valid
5341 5345
5342 for(int i=0; i<mlen; i++) active[i] = true; 5346 for (int i = 0; i < mlen; i++)
5347 active[i] = true;
5343 5348
5344 offset[mlen] = srclen; 5349 offset[mlen] = srclen;
5345 5350
5346 while(beginning<srclen) 5351 while (beginning < srclen)
5347 { 5352 {
5348 5353
5349 best = mlen; // as bad as it gets 5354 best = mlen; // as bad as it gets
5350 5355
5351 // Scan for separators 5356 // Scan for separators
5352 5357
5353 for(j=0; j<seplen; j++) 5358 for (j = 0; j < seplen; j++)
5354 { 5359 {
5355 if (active[j]) 5360 if (active[j])
5356 { 5361 {
5357 // scan all of the markers 5362 // scan all of the markers
@@ -5359,7 +5364,8 @@ namespace OpenSim.Region.ScriptEngine.Common
5359 { 5364 {
5360 // not present at all 5365 // not present at all
5361 active[j] = false; 5366 active[j] = false;
5362 } else 5367 }
5368 else
5363 { 5369 {
5364 // present and correct 5370 // present and correct
5365 if (offset[j] < offset[best]) 5371 if (offset[j] < offset[best])
@@ -5377,7 +5383,7 @@ namespace OpenSim.Region.ScriptEngine.Common
5377 5383
5378 if (offset[best] != beginning) 5384 if (offset[best] != beginning)
5379 { 5385 {
5380 for(j=seplen; (j<mlen) && (offset[best] > beginning); j++) 5386 for (j = seplen; (j < mlen) && (offset[best] > beginning); j++)
5381 { 5387 {
5382 if (active[j]) 5388 if (active[j])
5383 { 5389 {
@@ -6174,7 +6180,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6174 { 6180 {
6175 foreach (object o in args.Data) 6181 foreach (object o in args.Data)
6176 { 6182 {
6177 switch(o.ToString()) 6183 switch (o.ToString())
6178 { 6184 {
6179 case "1": 6185 case "1":
6180 ret.Add(av.Firstname + " " + av.Lastname); 6186 ret.Add(av.Firstname + " " + av.Lastname);
@@ -6207,9 +6213,9 @@ namespace OpenSim.Region.ScriptEngine.Common
6207 SceneObjectPart obj = World.GetSceneObjectPart(key); 6213 SceneObjectPart obj = World.GetSceneObjectPart(key);
6208 if (obj != null) 6214 if (obj != null)
6209 { 6215 {
6210 foreach(object o in args.Data) 6216 foreach (object o in args.Data)
6211 { 6217 {
6212 switch(o.ToString()) 6218 switch (o.ToString())
6213 { 6219 {
6214 case "1": 6220 case "1":
6215 ret.Add(obj.Name); 6221 ret.Add(obj.Name);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index 369f6a7..d824f0c 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -370,21 +370,21 @@ namespace OpenSim.Region.ScriptEngine.Common
370 LSL_Types.list llList2List(LSL_Types.list src, int start, int end); 370 LSL_Types.list llList2List(LSL_Types.list src, int start, int end);
371 //wiki: llDeleteSubList(list src, integer start, integer end) 371 //wiki: llDeleteSubList(list src, integer start, integer end)
372 LSL_Types.list llDeleteSubList(LSL_Types.list src, int start, int end); 372 LSL_Types.list llDeleteSubList(LSL_Types.list src, int start, int end);
373 //wiki: integer llGetListEntryType( list src, integer index ) 373 //wiki: integer llGetListEntryType(list src, integer index)
374 LSL_Types.LSLInteger llGetListEntryType(LSL_Types.list src, int index); 374 LSL_Types.LSLInteger llGetListEntryType(LSL_Types.list src, int index);
375 //wiki: string llList2CSV( list src ) 375 //wiki: string llList2CSV(list src)
376 string llList2CSV(LSL_Types.list src); 376 string llList2CSV(LSL_Types.list src);
377 //wiki: list llCSV2List( string src ) 377 //wiki: list llCSV2List(string src)
378 LSL_Types.list llCSV2List(string src); 378 LSL_Types.list llCSV2List(string src);
379 //wiki: list llListRandomize( list src, integer stride ) 379 //wiki: list llListRandomize(list src, integer stride)
380 LSL_Types.list llListRandomize(LSL_Types.list src, int stride); 380 LSL_Types.list llListRandomize(LSL_Types.list src, int stride);
381 //wiki: list llList2ListStrided( list src, integer start, integer end, integer stride ) 381 //wiki: list llList2ListStrided(list src, integer start, integer end, integer stride)
382 LSL_Types.list llList2ListStrided(LSL_Types.list src, int start, int end, int stride); 382 LSL_Types.list llList2ListStrided(LSL_Types.list src, int start, int end, int stride);
383 //wiki: vector llGetRegionCorner( ) 383 //wiki: vector llGetRegionCorner()
384 LSL_Types.Vector3 llGetRegionCorner(); 384 LSL_Types.Vector3 llGetRegionCorner();
385 //wiki: list llListInsertList( list dest, list src, integer start ) 385 //wiki: list llListInsertList(list dest, list src, integer start)
386 LSL_Types.list llListInsertList(LSL_Types.list dest, LSL_Types.list src, int start); 386 LSL_Types.list llListInsertList(LSL_Types.list dest, LSL_Types.list src, int start);
387 //wiki: integer llListFindList( list src, list test ) 387 //wiki: integer llListFindList(list src, list test)
388 LSL_Types.LSLInteger llListFindList(LSL_Types.list src, LSL_Types.list test); 388 LSL_Types.LSLInteger llListFindList(LSL_Types.list src, LSL_Types.list test);
389 //wiki: string llGetObjectName() 389 //wiki: string llGetObjectName()
390 string llGetObjectName(); 390 string llGetObjectName();
@@ -479,7 +479,7 @@ namespace OpenSim.Region.ScriptEngine.Common
479 string llDumpList2String(LSL_Types.list src, string seperator); 479 string llDumpList2String(LSL_Types.list src, string seperator);
480 //wiki: integer llScriptDanger(vector pos) 480 //wiki: integer llScriptDanger(vector pos)
481 LSL_Types.LSLInteger llScriptDanger(LSL_Types.Vector3 pos); 481 LSL_Types.LSLInteger llScriptDanger(LSL_Types.Vector3 pos);
482 //wiki: llDialog( key avatar, string message, list buttons, integer chat_channel ) 482 //wiki: llDialog(key avatar, string message, list buttons, integer chat_channel)
483 void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel); 483 void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel);
484 //wiki: llVolumeDetect(integer detect) 484 //wiki: llVolumeDetect(integer detect)
485 void llVolumeDetect(int detect); 485 void llVolumeDetect(int detect);
@@ -503,9 +503,9 @@ namespace OpenSim.Region.ScriptEngine.Common
503 void llCloseRemoteDataChannel(string channel); 503 void llCloseRemoteDataChannel(string channel);
504 //wiki: string llMD5String(string src, integer nonce) 504 //wiki: string llMD5String(string src, integer nonce)
505 string llMD5String(string src, int nonce); 505 string llMD5String(string src, int nonce);
506 //wiki: llSetPrimitiveParams( list rules ) 506 //wiki: llSetPrimitiveParams(list rules)
507 void llSetPrimitiveParams(LSL_Types.list rules); 507 void llSetPrimitiveParams(LSL_Types.list rules);
508 //wiki: llSetLinkPrimitiveParams(integer linknumber, list rules ) 508 //wiki: llSetLinkPrimitiveParams(integer linknumber, list rules)
509 void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules); 509 void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules);
510 //wiki: string llStringToBase64(string str) 510 //wiki: string llStringToBase64(string str)
511 string llStringToBase64(string str); 511 string llStringToBase64(string str);
@@ -519,7 +519,7 @@ namespace OpenSim.Region.ScriptEngine.Common
519 double llLog10(double val); 519 double llLog10(double val);
520 //wiki: double llLog(double val) 520 //wiki: double llLog(double val)
521 double llLog(double val); 521 double llLog(double val);
522 //wiki: list llGetAnimationList( key id ) 522 //wiki: list llGetAnimationList(key id)
523 LSL_Types.list llGetAnimationList(string id); 523 LSL_Types.list llGetAnimationList(string id);
524 //wiki: llSetParcelMusicURL(string url) 524 //wiki: llSetParcelMusicURL(string url)
525 void llSetParcelMusicURL(string url); 525 void llSetParcelMusicURL(string url);
@@ -541,7 +541,7 @@ namespace OpenSim.Region.ScriptEngine.Common
541 LSL_Types.LSLInteger llGetNumberOfPrims(); 541 LSL_Types.LSLInteger llGetNumberOfPrims();
542 //wiki: key llGetNumberOfNotecardLines(string name) 542 //wiki: key llGetNumberOfNotecardLines(string name)
543 string llGetNumberOfNotecardLines(string name); 543 string llGetNumberOfNotecardLines(string name);
544 //wiki: list llGetBoundingBox( key object ) 544 //wiki: list llGetBoundingBox(key object)
545 LSL_Types.list llGetBoundingBox(string obj); 545 LSL_Types.list llGetBoundingBox(string obj);
546 //wiki: vector llGetGeometricCenter() 546 //wiki: vector llGetGeometricCenter()
547 LSL_Types.Vector3 llGetGeometricCenter(); 547 LSL_Types.Vector3 llGetGeometricCenter();
@@ -557,7 +557,7 @@ namespace OpenSim.Region.ScriptEngine.Common
557 string llGetSimulatorHostname(); 557 string llGetSimulatorHostname();
558 //llSetLocalRot(rotation rot) 558 //llSetLocalRot(rotation rot)
559 void llSetLocalRot(LSL_Types.Quaternion rot); 559 void llSetLocalRot(LSL_Types.Quaternion rot);
560 //wiki: list llParseStringKeepNulls( string src, list separators, list spacers ) 560 //wiki: list llParseStringKeepNulls(string src, list separators, list spacers)
561 LSL_Types.list llParseStringKeepNulls(string src, LSL_Types.list seperators, LSL_Types.list spacers); 561 LSL_Types.list llParseStringKeepNulls(string src, LSL_Types.list seperators, LSL_Types.list spacers);
562 //wiki: llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, integer param) 562 //wiki: llRezAtRoot(string inventory, vector position, vector velocity, rotation rot, integer param)
563 void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity, 563 void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity,
@@ -584,14 +584,14 @@ namespace OpenSim.Region.ScriptEngine.Common
584 LSL_Types.list llListReplaceList(LSL_Types.list dest, LSL_Types.list src, int start, int end); 584 LSL_Types.list llListReplaceList(LSL_Types.list dest, LSL_Types.list src, int start, int end);
585 //wiki: llLoadURL(key avatar_id, string message, string url) 585 //wiki: llLoadURL(key avatar_id, string message, string url)
586 void llLoadURL(string avatar_id, string message, string url); 586 void llLoadURL(string avatar_id, string message, string url);
587 //wiki: llParcelMediaCommandList( list commandList ) 587 //wiki: llParcelMediaCommandList(list commandList)
588 void llParcelMediaCommandList(LSL_Types.list commandList); 588 void llParcelMediaCommandList(LSL_Types.list commandList);
589 void llParcelMediaQuery(); 589 void llParcelMediaQuery();
590 //wiki integer llModPow(integer a, integer b, integer c) 590 //wiki integer llModPow(integer a, integer b, integer c)
591 LSL_Types.LSLInteger llModPow(int a, int b, int c); 591 LSL_Types.LSLInteger llModPow(int a, int b, int c);
592 //wiki: integer llGetInventoryType(string name) 592 //wiki: integer llGetInventoryType(string name)
593 LSL_Types.LSLInteger llGetInventoryType(string name); 593 LSL_Types.LSLInteger llGetInventoryType(string name);
594 //wiki: llSetPayPrice( integer price, list quick_pay_buttons ) 594 //wiki: llSetPayPrice(integer price, list quick_pay_buttons)
595 void llSetPayPrice(int price, LSL_Types.list quick_pay_buttons); 595 void llSetPayPrice(int price, LSL_Types.list quick_pay_buttons);
596 //wiki: vector llGetCameraPos() 596 //wiki: vector llGetCameraPos()
597 LSL_Types.Vector3 llGetCameraPos(); 597 LSL_Types.Vector3 llGetCameraPos();
@@ -613,11 +613,11 @@ namespace OpenSim.Region.ScriptEngine.Common
613 void llRemoveFromLandPassList(string avatar); 613 void llRemoveFromLandPassList(string avatar);
614 //wiki: llRemoveFromLandBanList(key avatar) 614 //wiki: llRemoveFromLandBanList(key avatar)
615 void llRemoveFromLandBanList(string avatar); 615 void llRemoveFromLandBanList(string avatar);
616 //wiki: llSetCameraParams( list rules ) 616 //wiki: llSetCameraParams(list rules)
617 void llSetCameraParams(LSL_Types.list rules); 617 void llSetCameraParams(LSL_Types.list rules);
618 //wiki: llClearCameraParams() 618 //wiki: llClearCameraParams()
619 void llClearCameraParams(); 619 void llClearCameraParams();
620 //wiki: double llListStatistics( integer operation, list src ) 620 //wiki: double llListStatistics(integer operation, list src)
621 double llListStatistics(int operation, LSL_Types.list src); 621 double llListStatistics(int operation, LSL_Types.list src);
622 //wiki: integer llGetUnixTime() 622 //wiki: integer llGetUnixTime()
623 LSL_Types.LSLInteger llGetUnixTime(); 623 LSL_Types.LSLInteger llGetUnixTime();
@@ -634,15 +634,15 @@ namespace OpenSim.Region.ScriptEngine.Common
634 void llResetLandPassList(); 634 void llResetLandPassList();
635 //wiki: integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide) 635 //wiki: integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
636 LSL_Types.LSLInteger llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide); 636 LSL_Types.LSLInteger llGetParcelPrimCount(LSL_Types.Vector3 pos, int category, int sim_wide);
637 //wiki: list llGetParcelPrimOwners( vector pos ) 637 //wiki: list llGetParcelPrimOwners(vector pos)
638 LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos); 638 LSL_Types.list llGetParcelPrimOwners(LSL_Types.Vector3 pos);
639 //wiki: integer llGetObjectPrimCount(key object_id) 639 //wiki: integer llGetObjectPrimCount(key object_id)
640 LSL_Types.LSLInteger llGetObjectPrimCount(string object_id); 640 LSL_Types.LSLInteger llGetObjectPrimCount(string object_id);
641 //wiki: integer llGetParcelMaxPrims( vector pos, integer sim_wide ) 641 //wiki: integer llGetParcelMaxPrims(vector pos, integer sim_wide)
642 LSL_Types.LSLInteger llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide); 642 LSL_Types.LSLInteger llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide);
643 //wiki: llGetParcelDetails(vector pos, list params) 643 //wiki: llGetParcelDetails(vector pos, list params)
644 LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param); 644 LSL_Types.list llGetParcelDetails(LSL_Types.Vector3 pos, LSL_Types.list param);
645 //wiki: llSetLinkTexture(integer linknumber, string texture, integer face ) 645 //wiki: llSetLinkTexture(integer linknumber, string texture, integer face)
646 void llSetLinkTexture(int linknumber, string texture, int face); 646 void llSetLinkTexture(int linknumber, string texture, int face);
647 //wiki: string llStringTrim(string src, int type) 647 //wiki: string llStringTrim(string src, int type)
648 string llStringTrim(string src, int type); 648 string llStringTrim(string src, int type);
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index 14ee319..c3a36dd 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -506,7 +506,7 @@ namespace OpenSim.Region.ScriptEngine.Common
506 int src; 506 int src;
507 int dest=0; 507 int dest=0;
508 508
509 for(src = 0 ; src < m_data.Length ; src++) 509 for (src = 0; src < m_data.Length; src++)
510 { 510 {
511 if (src < start || src > end) 511 if (src < start || src > end)
512 ret[dest++]=m_data[src]; 512 ret[dest++]=m_data[src];
@@ -624,9 +624,9 @@ namespace OpenSim.Region.ScriptEngine.Common
624 Array.Copy(Data, 0, ret, 0, Data.Length); 624 Array.Copy(Data, 0, ret, 0, Data.Length);
625 625
626 keys=new string[Data.Length]; 626 keys=new string[Data.Length];
627 int k; 627
628 for(k=0;k<Data.Length;k++) 628 for (int k = 0; k < Data.Length; k++)
629 keys[k]=Data[k].ToString(); 629 keys[k] = Data[k].ToString();
630 630
631 Array.Sort(keys, ret); 631 Array.Sort(keys, ret);
632 632
@@ -644,11 +644,11 @@ namespace OpenSim.Region.ScriptEngine.Common
644 644
645 int i; 645 int i;
646 646
647 while(src < Data.Length) 647 while (src < Data.Length)
648 { 648 {
649 Object[] o=new Object[stride]; 649 Object[] o=new Object[stride];
650 650
651 for(i=0;i<stride;i++) 651 for (i = 0; i < stride; i++)
652 { 652 {
653 if (src < Data.Length) 653 if (src < Data.Length)
654 o[i]=Data[src++]; 654 o[i]=Data[src++];
@@ -672,11 +672,9 @@ namespace OpenSim.Region.ScriptEngine.Common
672 672
673 Object[] sorted=new Object[stride*vals.Length]; 673 Object[] sorted=new Object[stride*vals.Length];
674 674
675 int j; 675 for (i = 0; i < vals.Length; i++)
676 676 for (int j = 0; j < stride; j++)
677 for(i=0;i<vals.Length;i++) 677 sorted[i*stride+j] = vals[i][j];
678 for(j=0;j<stride;j++)
679 sorted[i*stride+j]=vals[i][j];
680 678
681 return new list(sorted); 679 return new list(sorted);
682 } 680 }
@@ -691,7 +689,7 @@ namespace OpenSim.Region.ScriptEngine.Common
691 public string ToCSV() 689 public string ToCSV()
692 { 690 {
693 string ret = ""; 691 string ret = "";
694 foreach(object o in this.Data) 692 foreach (object o in this.Data)
695 { 693 {
696 if (ret == "") 694 if (ret == "")
697 { 695 {
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
index 5c7f862..2b6f6d9 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
@@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.Common
340 IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); 340 IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
341 LLUUID createdTexture = 341 LLUUID createdTexture =
342 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, 342 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
343 extraParams, timer, true, (byte) alpha ); 343 extraParams, timer, true, (byte) alpha);
344 return createdTexture.ToString(); 344 return createdTexture.ToString();
345 } 345 }
346 else 346 else
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
index 1210b77..4311836 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs
@@ -235,7 +235,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin
235 // dot=dot(forward_dir,obj_dir) 235 // dot=dot(forward_dir,obj_dir)
236 // mag_fwd = mag(forward_dir) 236 // mag_fwd = mag(forward_dir)
237 // mag_obj = mag(obj_dir) 237 // mag_obj = mag(obj_dir)
238 // ang = acos( dot /(mag_fwd*mag_obj)) 238 // ang = acos(dot /(mag_fwd*mag_obj))
239 double ang_obj = 0; 239 double ang_obj = 0;
240 try 240 try
241 { 241 {
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
index 214f7c9..f2afe0f 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
76 76
77 // TODO: HOOK ALL EVENTS UP TO SERVER! 77 // TODO: HOOK ALL EVENTS UP TO SERVER!
78 IMoneyModule money=myScriptEngine.World.RequestModuleInterface<IMoneyModule>(); 78 IMoneyModule money=myScriptEngine.World.RequestModuleInterface<IMoneyModule>();
79 if(money != null) 79 if (money != null)
80 { 80 {
81 money.OnObjectPaid+=HandleObjectPaid; 81 money.OnObjectPaid+=HandleObjectPaid;
82 } 82 }
@@ -91,7 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
91 private void HandleObjectPaid(LLUUID objectID, LLUUID agentID, int amount) 91 private void HandleObjectPaid(LLUUID objectID, LLUUID agentID, int amount)
92 { 92 {
93 SceneObjectPart part=myScriptEngine.World.GetSceneObjectPart(objectID); 93 SceneObjectPart part=myScriptEngine.World.GetSceneObjectPart(objectID);
94 if(part != null) 94 if (part != null)
95 { 95 {
96 money(part.LocalId, agentID, amount); 96 money(part.LocalId, agentID, amount);
97 } 97 }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index 3dbd88c..997f46f 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -297,10 +297,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
297 // Send inner exception 297 // Send inner exception
298 string[] lines=e.InnerException.ToString().Replace("\r", "").Split('\n'); 298 string[] lines=e.InnerException.ToString().Replace("\r", "").Split('\n');
299 int line=0; 299 int line=0;
300 foreach(string t in lines) 300 foreach (string t in lines)
301 { 301 {
302 int idx=t.IndexOf("SecondLife.Script."); 302 int idx=t.IndexOf("SecondLife.Script.");
303 if(idx != -1) 303 if (idx != -1)
304 { 304 {
305 int colon=t.IndexOf(":"); 305 int colon=t.IndexOf(":");
306 line=Convert.ToInt32(t.Substring(colon+1)); 306 line=Convert.ToInt32(t.Substring(colon+1));
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
index 3320ddb..715e465 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
@@ -182,7 +182,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
182 if (DateTime.Now.Ticks - Last_ReReadConfigFilens > 182 if (DateTime.Now.Ticks - Last_ReReadConfigFilens >
183 m_ScriptEngine.RefreshConfigFilens) 183 m_ScriptEngine.RefreshConfigFilens)
184 { 184 {
185 //Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens ); 185 //Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens);
186 // Its time to re-read config file 186 // Its time to re-read config file
187 m_ScriptEngine.ReadConfig(); 187 m_ScriptEngine.ReadConfig();
188 Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time 188 Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time