aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/Meshing/SculptMesh.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs32
2 files changed, 10 insertions, 26 deletions
diff --git a/OpenSim/Region/Physics/Meshing/SculptMesh.cs b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
index 707c0e3..d4bd65f 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMesh.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMesh.cs
@@ -36,8 +36,7 @@ namespace OpenSim.Region.Physics.Meshing
36{ 36{
37 // This functionality based on the XNA SculptPreview by John Hurliman. 37 // This functionality based on the XNA SculptPreview by John Hurliman.
38 public class SculptMesh : Mesh 38 public class SculptMesh : Mesh
39 { 39 {
40 ManagedImage managedImage;
41 Image idata = null; 40 Image idata = null;
42 Bitmap bLOD = null; 41 Bitmap bLOD = null;
43 Bitmap bBitmap = null; 42 Bitmap bBitmap = null;
@@ -55,6 +54,7 @@ namespace OpenSim.Region.Physics.Meshing
55 54
56 try 55 try
57 { 56 {
57 ManagedImage managedImage; // we never use this
58 OpenJPEG.DecodeToImage(jpegData, out managedImage, out idata); 58 OpenJPEG.DecodeToImage(jpegData, out managedImage, out idata);
59 //int i = 0; 59 //int i = 0;
60 //i = i / i; 60 //i = i / i;
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
index db12c24..efe40a3 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
@@ -719,6 +719,7 @@ namespace OpenSim.Region.ScriptEngine.Common
719 //advance the counter to the letter 'e' 719 //advance the counter to the letter 'e'
720 i = i+4; 720 i = i+4;
721 break; 721 break;
722
722 default: 723 default:
723 // ok here we're catching all numeric types int,double,long we might want to spit these up mr accurately 724 // ok here we're catching all numeric types int,double,long we might want to spit these up mr accurately
724 // but for now we'll just do them as strings 725 // but for now we'll just do them as strings
@@ -726,7 +727,7 @@ namespace OpenSim.Region.ScriptEngine.Common
726 string numberValue=""; 727 string numberValue="";
727 728
728 // just loop through until the next known marker quote mark storing the string 729 // just loop through until the next known marker quote mark storing the string
729 while(JSON[i]!='"' && JSON[i]!=',' && JSON[i]!=']' && JSON[i]!='}' && JSON[i]!=' ') 730 while(JSON[i] != '"' && JSON[i] != ',' && JSON[i] != ']' && JSON[i] != '}' && JSON[i] != ' ')
730 { 731 {
731 numberValue+=""+JSON[i++]; 732 numberValue+=""+JSON[i++];
732 } 733 }
@@ -745,34 +746,17 @@ namespace OpenSim.Region.ScriptEngine.Common
745 // now lets clear the key, we're done with it and moving on 746 // now lets clear the key, we're done with it and moving on
746 currentKey=null; 747 currentKey=null;
747 } 748 }
748 749
749
750 break; 750 break;
751 } 751 }
752 752 }
753
754
755
756 }
757
758 } 753 }
759 catch(Exception e) 754 catch(Exception)
760 { 755 {
761 LSLError("osParseJSON: The JSON string is not valid " + JSON); 756 LSLError("osParseJSON: The JSON string is not valid " + JSON);
762 } 757 }
763 758
764 return jsondata; 759 return jsondata;
765 760 }
766
767 }
768
769
770
771
772
773
774
775
776
777 } 761 }
778} 762}