From 0dc1018ca162325cf0ec8fa04167e3a99adedd61 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 12 Sep 2008 21:20:24 +0000
Subject: * minor: Remove warnings * leaving in the ones to do with ScriptBase
 since these actually indicate coding bugs that I don't have the
 time/brainpower to fix at the moment

---
 OpenSim/Region/Physics/Meshing/SculptMesh.cs       |  4 +--
 .../ScriptEngine/Common/OSSL_BuilIn_Commands.cs    | 32 ++++++----------------
 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
 {
     // This functionality based on the XNA SculptPreview by John Hurliman.
     public class SculptMesh : Mesh
-    {
-        ManagedImage managedImage;
+    {        
         Image idata = null;
         Bitmap bLOD = null;
         Bitmap bBitmap = null;
@@ -55,6 +54,7 @@ namespace OpenSim.Region.Physics.Meshing
 
             try
             {
+                ManagedImage managedImage;  // we never use this
                 OpenJPEG.DecodeToImage(jpegData, out managedImage, out idata);
                 //int i = 0;
                 //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
 	                        //advance the counter to the letter 'e'
 	                        i = i+4;
                         break;
+                        
                         default:
 	                        // ok here we're catching all numeric types int,double,long we might want to spit these up mr accurately
 	                        // but for now we'll just do them as strings
@@ -726,7 +727,7 @@ namespace OpenSim.Region.ScriptEngine.Common
 	                        string numberValue="";
 	                        
 	                        // just loop through until the next known marker quote mark storing the string
-	                        while(JSON[i]!='"' && JSON[i]!=',' && JSON[i]!=']' && JSON[i]!='}' && JSON[i]!=' ')
+	                        while(JSON[i] != '"' && JSON[i] != ',' && JSON[i] != ']' && JSON[i] != '}' && JSON[i] != ' ')
 	                        {
 	                            numberValue+=""+JSON[i++];
 	                        }
@@ -745,34 +746,17 @@ namespace OpenSim.Region.ScriptEngine.Common
 	                            // now lets clear the key, we're done with it and moving on
 	                            currentKey=null;
 	                        }
-	                        
-                        
+	                                                
                         break;
-                    }
-                    
-                    
-                    
-                    
-                }
-                
+                    }                                                                              
+                }                
             }
-            catch(Exception e)
+            catch(Exception)
             {
                 LSLError("osParseJSON: The JSON string is not valid " + JSON);
             }
             
-            return jsondata;
-            
-            
-        }
-        
-        
-       
-        
-        
-        
-        
-        
-        
+            return jsondata;                        
+        }     
     }
 }
-- 
cgit v1.1