OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
0.6.0-stable
Justin Clarke Casey 2008-09-12 21:20:24 +00:00
parent ecc2a0f866
commit 0dc1018ca1
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/Meshing/SculptMesh.cs
View File

@ -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;

32
OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
View File

@ -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;
}
}
}