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

Thank you kindly, Melanie for a patch to solve 

llParticleSystem and osDynamicTexture issues.
0.6.0-stable
Charles Krinke 2008-05-02 23:23:39 +00:00
parent e538a34acc
commit 18362b25bf
3 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3989,7 +3989,7 @@ namespace OpenSim.Region.ScriptEngine.Common
break; break;
case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_PATTERN: case (int)BuiltIn_Commands_BaseClass.PSYS_SRC_PATTERN:
int tmpi = (int)rules.Data[i + 1]; int tmpi = int.Parse(rules.Data[i + 1].ToString());
prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi; prules.Pattern = (Primitive.ParticleSystem.SourcePattern)tmpi;
break; break;

77
OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
View File

@ -704,6 +704,37 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
return ret; return ret;
} }
private string ToSoup()
{
string output;
output = String.Empty;
if (m_data.Length == 0)
{
return String.Empty;
}
foreach (object o in m_data)
{
output = output + o.ToString();
}
return output;
}
public static explicit operator String(list l)
{
return l.ToSoup();
}
public static explicit operator LSLString(list l)
{
return new LSLString(l.ToSoup());
}
public override string ToString()
{
return ToSoup();
}
#endregion #endregion
#region Statistic Methods #region Statistic Methods
@ -935,36 +966,6 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
} }
public override string ToString()
{
string output;
output = String.Empty;
if (m_data.Length == 0)
{
return String.Empty;
}
foreach (object o in m_data)
{
output = output + o.ToString();
}
return output;
}
public static explicit operator string(list l)
{
string output;
output = String.Empty;
if (l.m_data.Length == 0)
{
return String.Empty;
}
foreach (object o in l.m_data)
{
output = output + o.ToString();
}
return output;
}
} }
// //
@ -1200,11 +1201,17 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
#endregion #endregion
static public implicit operator Int32(LSLInteger i)
static public implicit operator int(LSLInteger i)
{ {
return i.value; return i.value;
} }
static public implicit operator uint(LSLInteger i)
{
return (uint)i.value;
}
static public explicit operator LSLString(LSLInteger i) static public explicit operator LSLString(LSLInteger i)
{ {
return new LSLString(i.ToString()); return new LSLString(i.ToString());
@ -1255,10 +1262,10 @@ namespace OpenSim.Region.ScriptEngine.Common
return i; return i;
} }
//static public implicit operator System.Double(LSLInteger i) static public implicit operator System.Double(LSLInteger i)
//{ {
// return (double)i.value; return (double)i.value;
//} }
#region Overriders #region Overriders

14
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
View File

@ -295,7 +295,19 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
if (e.InnerException != null) if (e.InnerException != null)
{ {
// Send inner exception // Send inner exception
text += e.InnerException.Message.ToString(); string[] lines=e.InnerException.ToString().Replace("\r", "").Split('\n');
int line=0;
foreach(string t in lines)
{
int idx=t.IndexOf("SecondLife.Script.");
if(idx != -1)
{
int colon=t.IndexOf(":");
line=Convert.ToInt32(t.Substring(colon+1));
break;
}
}
text += e.InnerException.Message.ToString()+" in line "+line.ToString();
} }
else else
{ {