aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2008-09-21 02:41:22 +0000
committerJeff Ames2008-09-21 02:41:22 +0000
commitc8349e21c43b1232aa923783a39cca224460551a (patch)
tree883f756507ea9984f5e7d56a4aa507d0640b57ee /OpenSim/Region
parentFix an exception in new ScriptEngine loader where a region would (diff)
downloadopensim-SC_OLD-c8349e21c43b1232aa923783a39cca224460551a.zip
opensim-SC_OLD-c8349e21c43b1232aa923783a39cca224460551a.tar.gz
opensim-SC_OLD-c8349e21c43b1232aa923783a39cca224460551a.tar.bz2
opensim-SC_OLD-c8349e21c43b1232aa923783a39cca224460551a.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs22
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs2
6 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index c1077f8..2e75486 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1335 1335
1336 IMesh mesh = null; 1336 IMesh mesh = null;
1337 1337
1338 if(_parent_scene.needsMeshing(_pbs)) 1338 if (_parent_scene.needsMeshing(_pbs))
1339 mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); 1339 mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
1340 1340
1341 //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); 1341 //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
@@ -2303,7 +2303,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2303 2303
2304 base.SendCollisionUpdate(CollisionEventsThisFrame); 2304 base.SendCollisionUpdate(CollisionEventsThisFrame);
2305 2305
2306 if(CollisionEventsThisFrame.m_objCollisionList.Count == 0) 2306 if (CollisionEventsThisFrame.m_objCollisionList.Count == 0)
2307 CollisionEventsThisFrame = null; 2307 CollisionEventsThisFrame = null;
2308 else 2308 else
2309 CollisionEventsThisFrame = new CollisionEventUpdate(); 2309 CollisionEventsThisFrame = new CollisionEventUpdate();
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 374e401..679b9b8 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -567,7 +567,7 @@ namespace OpenSim.Region.ScriptEngine.Common
567 double z = axis.z * s; 567 double z = axis.z * s;
568 double w = Math.Cos(angle / 2); 568 double w = Math.Cos(angle / 2);
569 569
570 if(Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w)) 570 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
571 return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f); 571 return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
572 572
573 return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w); 573 return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c806697..d2cfdca 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -586,7 +586,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
586 double z = axis.z * s; 586 double z = axis.z * s;
587 double w = Math.Cos(angle / 2); 587 double w = Math.Cos(angle / 2);
588 588
589 if(Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w)) 589 if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
590 return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f); 590 return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
591 591
592 return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w); 592 return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index c0c776d..ffde7ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -755,18 +755,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
755 { 755 {
756 756
757 // Console.WriteLine(""+JSON[i]); 757 // Console.WriteLine(""+JSON[i]);
758 switch(JSON[i]) 758 switch (JSON[i])
759 { 759 {
760 case '{': 760 case '{':
761 // create hashtable and add it to the stack or array if we are populating one, we can have a lot of nested objects in JSON 761 // create hashtable and add it to the stack or array if we are populating one, we can have a lot of nested objects in JSON
762 762
763 Hashtable currentObject = new Hashtable(); 763 Hashtable currentObject = new Hashtable();
764 if(objectStack.Count==0) // the stack should only be empty for the first outer object 764 if (objectStack.Count==0) // the stack should only be empty for the first outer object
765 { 765 {
766 766
767 objectStack.Push(jsondata); 767 objectStack.Push(jsondata);
768 } 768 }
769 else if(objectStack.Peek().ToString()=="System.Collections.ArrayList") 769 else if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
770 { 770 {
771 // add it to the parent array 771 // add it to the parent array
772 ((ArrayList)objectStack.Peek()).Add(currentObject); 772 ((ArrayList)objectStack.Peek()).Add(currentObject);
@@ -792,17 +792,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
792 i++; // move to next char 792 i++; // move to next char
793 793
794 // just loop through until the next quote mark storing the string 794 // just loop through until the next quote mark storing the string
795 while(JSON[i]!='"') 795 while (JSON[i]!='"')
796 { 796 {
797 tokenValue+=JSON[i++]; 797 tokenValue+=JSON[i++];
798 } 798 }
799 799
800 // ok we've got a string, if we've got an array on the top of the stack then we store it 800 // ok we've got a string, if we've got an array on the top of the stack then we store it
801 if(objectStack.Peek().ToString()=="System.Collections.ArrayList") 801 if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
802 { 802 {
803 ((ArrayList)objectStack.Peek()).Add(tokenValue); 803 ((ArrayList)objectStack.Peek()).Add(tokenValue);
804 } 804 }
805 else if(currentKey==null) // no key stored and its not an array this must be a key so store it 805 else if (currentKey==null) // no key stored and its not an array this must be a key so store it
806 { 806 {
807 currentKey = tokenValue; 807 currentKey = tokenValue;
808 } 808 }
@@ -824,7 +824,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
824 case '[': // array start 824 case '[': // array start
825 ArrayList currentArray = new ArrayList(); 825 ArrayList currentArray = new ArrayList();
826 826
827 if(objectStack.Peek().ToString()=="System.Collections.ArrayList") 827 if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
828 { 828 {
829 ((ArrayList)objectStack.Peek()).Add(currentArray); 829 ((ArrayList)objectStack.Peek()).Add(currentArray);
830 } 830 }
@@ -846,7 +846,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
846 break; 846 break;
847 case 't': // we've found a character start not in quotes, it must be a boolean true 847 case 't': // we've found a character start not in quotes, it must be a boolean true
848 848
849 if(objectStack.Peek().ToString()=="System.Collections.ArrayList") 849 if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
850 { 850 {
851 ((ArrayList)objectStack.Peek()).Add(true); 851 ((ArrayList)objectStack.Peek()).Add(true);
852 } 852 }
@@ -860,7 +860,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
860 break; 860 break;
861 case 'f': // we've found a character start not in quotes, it must be a boolean false 861 case 'f': // we've found a character start not in quotes, it must be a boolean false
862 862
863 if(objectStack.Peek().ToString()=="System.Collections.ArrayList") 863 if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
864 { 864 {
865 ((ArrayList)objectStack.Peek()).Add(false); 865 ((ArrayList)objectStack.Peek()).Add(false);
866 } 866 }
@@ -879,7 +879,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
879 string numberValue=""; 879 string numberValue="";
880 880
881 // just loop through until the next known marker quote mark storing the string 881 // just loop through until the next known marker quote mark storing the string
882 while(JSON[i] != '"' && JSON[i] != ',' && JSON[i] != ']' && JSON[i] != '}' && JSON[i] != ' ') 882 while (JSON[i] != '"' && JSON[i] != ',' && JSON[i] != ']' && JSON[i] != '}' && JSON[i] != ' ')
883 { 883 {
884 numberValue+=""+JSON[i++]; 884 numberValue+=""+JSON[i++];
885 } 885 }
@@ -887,7 +887,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
887 i--; // we want to process this caracter that marked the end of this string in the main loop 887 i--; // we want to process this caracter that marked the end of this string in the main loop
888 888
889 // ok we've got a string, if we've got an array on the top of the stack then we store it 889 // ok we've got a string, if we've got an array on the top of the stack then we store it
890 if(objectStack.Peek().ToString()=="System.Collections.ArrayList") 890 if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
891 { 891 {
892 ((ArrayList)objectStack.Peek()).Add(numberValue); 892 ((ArrayList)objectStack.Peek()).Add(numberValue);
893 } 893 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index ba1aa2a..5836cc1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
169 Array.Copy(data, 0, v.Data, 0, data.Length); 169 Array.Copy(data, 0, v.Data, 0, data.Length);
170 m_Fields[var.Key].SetValue(this, v); 170 m_Fields[var.Key].SetValue(this, v);
171 } 171 }
172 else if(m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLInteger) || 172 else if (m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLInteger) ||
173 m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLString) || 173 m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLString) ||
174 m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLFloat) || 174 m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLFloat) ||
175 m_Fields[var.Key].FieldType == typeof(Int32) || 175 m_Fields[var.Key].FieldType == typeof(Int32) ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 80d7743..3a8c4da 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -514,7 +514,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
514 /// <returns></returns> 514 /// <returns></returns>
515 public object EventProcessor() 515 public object EventProcessor()
516 { 516 {
517 lock(m_Script) 517 lock (m_Script)
518 { 518 {
519 EventParams data = null; 519 EventParams data = null;
520 520