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

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-09-21 02:41:22 +00:00
parent b597cbf39d
commit c8349e21c4
32 changed files with 1396 additions and 1396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -1335,7 +1335,7 @@ namespace OpenSim.Region.Physics.OdePlugin
IMesh mesh = null; IMesh mesh = null;
if(_parent_scene.needsMeshing(_pbs)) if (_parent_scene.needsMeshing(_pbs))
mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
//IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical); //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
@ -2303,7 +2303,7 @@ namespace OpenSim.Region.Physics.OdePlugin
base.SendCollisionUpdate(CollisionEventsThisFrame); base.SendCollisionUpdate(CollisionEventsThisFrame);
if(CollisionEventsThisFrame.m_objCollisionList.Count == 0) if (CollisionEventsThisFrame.m_objCollisionList.Count == 0)
CollisionEventsThisFrame = null; CollisionEventsThisFrame = null;
else else
CollisionEventsThisFrame = new CollisionEventUpdate(); CollisionEventsThisFrame = new CollisionEventUpdate();

2
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -567,7 +567,7 @@ namespace OpenSim.Region.ScriptEngine.Common
double z = axis.z * s; double z = axis.z * s;
double w = Math.Cos(angle / 2); double w = Math.Cos(angle / 2);
if(Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w)) if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f); return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w); return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w);

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -586,7 +586,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
double z = axis.z * s; double z = axis.z * s;
double w = Math.Cos(angle / 2); double w = Math.Cos(angle / 2);
if(Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w)) if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f); return new LSL_Types.Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w); return new LSL_Types.Quaternion((float)x, (float)y, (float)z, (float)w);

22
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -755,18 +755,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
// Console.WriteLine(""+JSON[i]); // Console.WriteLine(""+JSON[i]);
switch(JSON[i]) switch (JSON[i])
{ {
case '{': case '{':
// 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 // 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
Hashtable currentObject = new Hashtable(); Hashtable currentObject = new Hashtable();
if(objectStack.Count==0) // the stack should only be empty for the first outer object if (objectStack.Count==0) // the stack should only be empty for the first outer object
{ {
objectStack.Push(jsondata); objectStack.Push(jsondata);
} }
else if(objectStack.Peek().ToString()=="System.Collections.ArrayList") else if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
{ {
// add it to the parent array // add it to the parent array
((ArrayList)objectStack.Peek()).Add(currentObject); ((ArrayList)objectStack.Peek()).Add(currentObject);
@ -792,17 +792,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
i++; // move to next char i++; // move to next char
// just loop through until the next quote mark storing the string // just loop through until the next quote mark storing the string
while(JSON[i]!='"') while (JSON[i]!='"')
{ {
tokenValue+=JSON[i++]; tokenValue+=JSON[i++];
} }
// ok we've got a string, if we've got an array on the top of the stack then we store it // ok we've got a string, if we've got an array on the top of the stack then we store it
if(objectStack.Peek().ToString()=="System.Collections.ArrayList") if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
{ {
((ArrayList)objectStack.Peek()).Add(tokenValue); ((ArrayList)objectStack.Peek()).Add(tokenValue);
} }
else if(currentKey==null) // no key stored and its not an array this must be a key so store it else if (currentKey==null) // no key stored and its not an array this must be a key so store it
{ {
currentKey = tokenValue; currentKey = tokenValue;
} }
@ -824,7 +824,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case '[': // array start case '[': // array start
ArrayList currentArray = new ArrayList(); ArrayList currentArray = new ArrayList();
if(objectStack.Peek().ToString()=="System.Collections.ArrayList") if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
{ {
((ArrayList)objectStack.Peek()).Add(currentArray); ((ArrayList)objectStack.Peek()).Add(currentArray);
} }
@ -846,7 +846,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
break; break;
case 't': // we've found a character start not in quotes, it must be a boolean true case 't': // we've found a character start not in quotes, it must be a boolean true
if(objectStack.Peek().ToString()=="System.Collections.ArrayList") if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
{ {
((ArrayList)objectStack.Peek()).Add(true); ((ArrayList)objectStack.Peek()).Add(true);
} }
@ -860,7 +860,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
break; break;
case 'f': // we've found a character start not in quotes, it must be a boolean false case 'f': // we've found a character start not in quotes, it must be a boolean false
if(objectStack.Peek().ToString()=="System.Collections.ArrayList") if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
{ {
((ArrayList)objectStack.Peek()).Add(false); ((ArrayList)objectStack.Peek()).Add(false);
} }
@ -879,7 +879,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
string numberValue=""; string numberValue="";
// just loop through until the next known marker quote mark storing the string // 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++]; numberValue+=""+JSON[i++];
} }
@ -887,7 +887,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
i--; // we want to process this caracter that marked the end of this string in the main loop i--; // we want to process this caracter that marked the end of this string in the main loop
// ok we've got a string, if we've got an array on the top of the stack then we store it // ok we've got a string, if we've got an array on the top of the stack then we store it
if(objectStack.Peek().ToString()=="System.Collections.ArrayList") if (objectStack.Peek().ToString()=="System.Collections.ArrayList")
{ {
((ArrayList)objectStack.Peek()).Add(numberValue); ((ArrayList)objectStack.Peek()).Add(numberValue);
} }

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
View File

@ -169,7 +169,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
Array.Copy(data, 0, v.Data, 0, data.Length); Array.Copy(data, 0, v.Data, 0, data.Length);
m_Fields[var.Key].SetValue(this, v); m_Fields[var.Key].SetValue(this, v);
} }
else if(m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLInteger) || else if (m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLInteger) ||
m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLString) || m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLString) ||
m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLFloat) || m_Fields[var.Key].FieldType == typeof(LSL_Types.LSLFloat) ||
m_Fields[var.Key].FieldType == typeof(Int32) || m_Fields[var.Key].FieldType == typeof(Int32) ||

2
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@ -514,7 +514,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
/// <returns></returns> /// <returns></returns>
public object EventProcessor() public object EventProcessor()
{ {
lock(m_Script) lock (m_Script)
{ {
EventParams data = null; EventParams data = null;