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

refactor: Make osGetPrimtiveParams() and soSetPrimitiveParams() use common get/set params code in LSL_Api rather than an old copy&pasted section.

0.8.0.3
Justin Clark-Casey (justincc) 2014-02-27 00:11:50 +00:00
parent 6955190c7d
commit d7c9725ec0
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7400,7 +7400,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
setLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams"); SetLinkPrimParams(ScriptBaseClass.LINK_THIS, rules, "llSetPrimitiveParams");
ScriptSleep(200); ScriptSleep(200);
} }
@ -7409,7 +7409,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams"); SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
ScriptSleep(200); ScriptSleep(200);
} }
@ -7418,13 +7418,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast"); SetLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast");
} }
protected void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc) protected void SetLinkPrimParams(int linknumber, LSL_List rules, string originFunc)
{ {
List<ISceneEntity> entities = GetLinkEntities(linknumber); SetEntityParams(GetLinkEntities(linknumber), rules, originFunc);
}
protected void SetEntityParams(List<ISceneEntity> entities, LSL_List rules, string originFunc)
{
LSL_List remaining = null; LSL_List remaining = null;
uint rulesParsed = 0; uint rulesParsed = 0;
@ -7438,7 +7441,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
while (remaining != null && remaining.Length > 2) while (remaining != null && remaining.Length > 2)
{ {
linknumber = remaining.GetLSLIntegerItem(0); int linknumber = remaining.GetLSLIntegerItem(0);
rules = remaining.GetSublist(1, -1); rules = remaining.GetSublist(1, -1);
entities = GetLinkEntities(linknumber); entities = GetLinkEntities(linknumber);
@ -11530,41 +11533,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (obj.OwnerID != m_host.OwnerID) if (obj.OwnerID != m_host.OwnerID)
return; return;
uint rulesParsed = 0; SetEntityParams(new List<ISceneEntity>() { obj }, rules, originFunc);
LSL_List remaining = SetPrimParams(obj, rules, originFunc, ref rulesParsed);
while ((object)remaining != null && remaining.Length > 2)
{
LSL_Integer newLink = remaining.GetLSLIntegerItem(0);
LSL_List newrules = remaining.GetSublist(1, -1);
foreach(SceneObjectPart part in GetLinkParts(obj, newLink)){
remaining = SetPrimParams(part, newrules, originFunc, ref rulesParsed);
}
}
} }
public LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules) public LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules)
{ {
SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim)); SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim));
LSL_List result = new LSL_List();
if (obj != null && obj.OwnerID == m_host.OwnerID) if (obj != null && obj.OwnerID == m_host.OwnerID)
{ return GetEntityParams(obj, rules);
LSL_List remaining = GetPrimParams(obj, rules, ref result);
while (remaining != null && remaining.Length > 2) return new LSL_List();
{
int linknumber = remaining.GetLSLIntegerItem(0);
rules = remaining.GetSublist(1, -1);
List<SceneObjectPart> parts = GetLinkParts(linknumber);
foreach (SceneObjectPart part in parts)
remaining = GetPrimParams(part, rules, ref result);
}
}
return result;
} }
public void print(string str) public void print(string str)