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

* Apply http://opensimulator.org/mantis/view.php?id=2401 

* Removes spacers that are also separators in llParseString2List
* Thanks idb
0.6.0-stable
Justin Clarke Casey 2008-10-16 17:14:02 +00:00
parent 7f721ae20c
commit 4df08aed30
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -411,6 +411,7 @@ namespace OpenSim.Region.Physics.OdePlugin
_parent_scene.actor_name_map[Shell] = (PhysicsActor) this; _parent_scene.actor_name_map[Shell] = (PhysicsActor) this;
} }
} }
/// <summary> /// <summary>
/// This creates the Avatar's physical Surrogate at the position supplied /// This creates the Avatar's physical Surrogate at the position supplied
/// </summary> /// </summary>

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

@ -4598,10 +4598,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// ScriptSleep(5000); // ScriptSleep(5000);
} }
public LSL_List llParseString2List(string str, LSL_List separators, LSL_List spacers) public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
LSL_List ret = new LSL_List(); LSL_List ret = new LSL_List();
LSL_List spacers = new LSL_List();
if (in_spacers.Length > 0 && separators.Length > 0)
{
for (int i = 0; i < in_spacers.Length; i++)
{
object s = in_spacers.Data[i];
for (int j = 0; j < separators.Length; j++)
{
if (separators.Data[j].ToString() == s.ToString())
{
s = null;
break;
}
}
if (s != null)
{
spacers.Add(s);
}
}
}
object[] delimiters = new object[separators.Length + spacers.Length]; object[] delimiters = new object[separators.Length + spacers.Length];
separators.Data.CopyTo(delimiters, 0); separators.Data.CopyTo(delimiters, 0);
spacers.Data.CopyTo(delimiters, separators.Length); spacers.Data.CopyTo(delimiters, separators.Length);