aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-04 21:37:11 +0000
committerJustin Clark-Casey (justincc)2013-01-04 21:37:11 +0000
commit7232cedd2b591a010ad11e5fb86448ac4dea460b (patch)
treee0351edd422119487691b8a72acf89905b4a03b0 /OpenSim/Region
parentFix build break caused by missing ) from dce2809. (diff)
downloadopensim-SC_OLD-7232cedd2b591a010ad11e5fb86448ac4dea460b.zip
opensim-SC_OLD-7232cedd2b591a010ad11e5fb86448ac4dea460b.tar.gz
opensim-SC_OLD-7232cedd2b591a010ad11e5fb86448ac4dea460b.tar.bz2
opensim-SC_OLD-7232cedd2b591a010ad11e5fb86448ac4dea460b.tar.xz
Set default particle burst count to 1 instead of 0 in any set particle system script call that does not have an empty list.
As per http://opensimulator.org/mantis/view.php?id=6353
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 115bac9..ea4e609 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6194,6 +6194,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6194 ps.BurstSpeedMax = 1.0f; 6194 ps.BurstSpeedMax = 1.0f;
6195 ps.BurstRate = 0.1f; 6195 ps.BurstRate = 0.1f;
6196 ps.PartMaxAge = 10.0f; 6196 ps.PartMaxAge = 10.0f;
6197 ps.BurstPartCount = 1;
6197 return ps; 6198 return ps;
6198 } 6199 }
6199 6200
@@ -6215,9 +6216,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6215 SetParticleSystem(m_host, rules); 6216 SetParticleSystem(m_host, rules);
6216 } 6217 }
6217 6218
6218 private void SetParticleSystem(SceneObjectPart part, LSL_List rules) { 6219 private void SetParticleSystem(SceneObjectPart part, LSL_List rules)
6219 6220 {
6220
6221 if (rules.Length == 0) 6221 if (rules.Length == 0)
6222 { 6222 {
6223 part.RemoveParticleSystem(); 6223 part.RemoveParticleSystem();