remove the expire argument from os[Link]ParticleSystem.. expire is controled by maxage != 0

This commit is contained in:
UbitUmarov
2021-01-12 16:12:44 +00:00
parent c215204e22
commit e25b05a454
3 changed files with 10 additions and 10 deletions

View File

@@ -6021,16 +6021,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return 1;
}
public void osParticleSystem(LSL_List rules, LSL_Integer expire)
public void osParticleSystem(LSL_List rules)
{
m_host.AddScriptLPS(1);
InitLSL();
if (m_LSL_Api != null)
m_LSL_Api.SetParticleSystem(m_host, rules, "osParticleSystem", expire == 1);
m_LSL_Api.SetParticleSystem(m_host, rules, "osParticleSystem", true);
}
public void osLinkParticleSystem(LSL_Integer linknumber, LSL_List rules, LSL_Integer expire)
public void osLinkParticleSystem(LSL_Integer linknumber, LSL_List rules)
{
InitLSL();
if (m_LSL_Api != null)
@@ -6039,7 +6039,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
foreach (SceneObjectPart part in parts)
{
m_LSL_Api.SetParticleSystem(part, rules, "osLinkParticleSystem", expire == 1);
m_LSL_Api.SetParticleSystem(part, rules, "osLinkParticleSystem", true);
}
}
}

View File

@@ -587,7 +587,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_Float daylen, LSL_Float dayoffset, LSL_Float altitude1, LSL_Float altitude2, LSL_Float altitude3);
LSL_Integer osResetEnvironment(LSL_Integer parcelOrRegion, LSL_Integer transition);
void osParticleSystem(LSL_List rules, LSL_Integer expire);
void osLinkParticleSystem(LSL_Integer linknumber, LSL_List rules, LSL_Integer expire);
void osParticleSystem(LSL_List rules);
void osLinkParticleSystem(LSL_Integer linknumber, LSL_List rules);
}
}

View File

@@ -1534,14 +1534,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osResetEnvironment(parcelOrRegion, transition);
}
public void osParticleSystem(LSL_List rules, LSL_Integer expire)
public void osParticleSystem(LSL_List rules)
{
m_OSSL_Functions.osParticleSystem(rules, expire);
m_OSSL_Functions.osParticleSystem(rules);
}
public void osLinkParticleSystem(LSL_Integer linknumber, LSL_List rules, LSL_Integer expire)
public void osLinkParticleSystem(LSL_Integer linknumber, LSL_List rules)
{
m_OSSL_Functions.osLinkParticleSystem(linknumber, rules, expire);
m_OSSL_Functions.osLinkParticleSystem(linknumber, rules);
}
}
}