aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage/llpartdata.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llmessage/llpartdata.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/linden/indra/llmessage/llpartdata.cpp b/linden/indra/llmessage/llpartdata.cpp
index a2811ab..4012d2c 100644
--- a/linden/indra/llmessage/llpartdata.cpp
+++ b/linden/indra/llmessage/llpartdata.cpp
@@ -363,14 +363,14 @@ LLSD LLPartSysData::asLLSD() const
363 sd["LL_PART_EMISSIVE_MASK"] = (LLPartData::LL_PART_EMISSIVE_MASK & mPartData.mFlags) ? 1 : 0; 363 sd["LL_PART_EMISSIVE_MASK"] = (LLPartData::LL_PART_EMISSIVE_MASK & mPartData.mFlags) ? 1 : 0;
364 sd["LL_PART_BEAM_MASK"] = (LLPartData::LL_PART_BEAM_MASK & mPartData.mFlags) ? 1 : 0; 364 sd["LL_PART_BEAM_MASK"] = (LLPartData::LL_PART_BEAM_MASK & mPartData.mFlags) ? 1 : 0;
365 365
366 sd["SourceMaxage"] = mPartData.mMaxAge; 366 sd["ParticleMaxAge"] = mPartData.mMaxAge;
367 sd["Startcolor"] = ll_sd_from_color4(mPartData.mStartColor); 367 sd["StartColor"] = ll_sd_from_color4(mPartData.mStartColor);
368 sd["Endcolor"] = ll_sd_from_color4(mPartData.mEndColor); 368 sd["EndColor"] = ll_sd_from_color4(mPartData.mEndColor);
369 sd["Startscale"] = ll_sd_from_vector2(mPartData.mStartScale); 369 sd["StartScale"] = ll_sd_from_vector2(mPartData.mStartScale);
370 sd["Endscale"] = ll_sd_from_vector2(mPartData.mEndScale); 370 sd["EndScale"] = ll_sd_from_vector2(mPartData.mEndScale);
371 371
372 sd["ParticleMaxAge"] = mMaxAge; 372 sd["SourceMaxAge"] = mMaxAge;
373 sd["ParticleStartAge"] = mStartAge; 373 sd["SourceStartAge"] = mStartAge;
374 374
375 375
376 sd["LL_PART_SRC_PATTERN_DROP"] = ( mPattern & LL_PART_SRC_PATTERN_DROP) ? 1 : 0; 376 sd["LL_PART_SRC_PATTERN_DROP"] = ( mPattern & LL_PART_SRC_PATTERN_DROP) ? 1 : 0;
@@ -406,14 +406,14 @@ bool LLPartSysData::fromLLSD(LLSD& sd)
406 if (sd["LL_PART_EMISSIVE_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_EMISSIVE_MASK; 406 if (sd["LL_PART_EMISSIVE_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_EMISSIVE_MASK;
407 if (sd["LL_PART_BEAM_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_BEAM_MASK; 407 if (sd["LL_PART_BEAM_MASK"]) mPartData.mFlags |= LLPartData::LL_PART_BEAM_MASK;
408 408
409 mPartData.mMaxAge = (F32)sd["SourceMaxage"].asReal(); 409 mPartData.mMaxAge = (F32)sd["ParticleMaxAge"].asReal();
410 mPartData.mStartColor = ll_color4_from_sd(sd["Startcolor"]); 410 mPartData.mStartColor = ll_color4_from_sd(sd["StartColor"]);
411 mPartData.mEndColor = ll_color4_from_sd(sd["Endcolor"]); 411 mPartData.mEndColor = ll_color4_from_sd(sd["EndColor"]);
412 mPartData.mStartScale = ll_vector2_from_sd(sd["Startscale"]); 412 mPartData.mStartScale = ll_vector2_from_sd(sd["StartScale"]);
413 mPartData.mEndScale = ll_vector2_from_sd(sd["Endscale"]); 413 mPartData.mEndScale = ll_vector2_from_sd(sd["EndScale"]);
414 414
415 mMaxAge = (F32)sd["ParticleMaxAge"].asReal(); 415 mMaxAge = (F32)sd["SourceMaxAge"].asReal();
416 mStartAge = (F32)sd["ParticleStartAge"].asReal(); 416 mStartAge = (F32)sd["SourceStartAge"].asReal();
417 417
418 mPattern = 0; 418 mPattern = 0;
419 if (sd["LL_PART_SRC_PATTERN_DROP"]) mPattern |= LL_PART_SRC_PATTERN_DROP; 419 if (sd["LL_PART_SRC_PATTERN_DROP"]) mPattern |= LL_PART_SRC_PATTERN_DROP;