cleaned up particle system llsd de/serialization; improvements to the avatar cloud

* llsd now uses camel case for each key, confusion of particle max age vs source max age fixed
* cloud.xml is now loaded with a fallback chain PER_SL_ACCOUNT -> USER_SETTINGS -> APP_SETTINGS so
  that customized clouds can exist per account or for all users and survive updates

3 files changed, 83 insertions, 55 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
         sd["LL_PART_EMISSIVE_MASK"]             = (LLPartData::LL_PART_EMISSIVE_MASK  & mPartData.mFlags) ? 1 : 0;
         sd["LL_PART_BEAM_MASK"]                 = (LLPartData::LL_PART_BEAM_MASK  & mPartData.mFlags) ? 1 : 0;
 
-        sd["SourceMaxage"] = mPartData.mMaxAge;
-        sd["Startcolor"] = ll_sd_from_color4(mPartData.mStartColor);
-        sd["Endcolor"] = ll_sd_from_color4(mPartData.mEndColor);
-        sd["Startscale"] = ll_sd_from_vector2(mPartData.mStartScale);
-        sd["Endscale"] = ll_sd_from_vector2(mPartData.mEndScale);
+        sd["ParticleMaxAge"] = mPartData.mMaxAge;
+        sd["StartColor"] = ll_sd_from_color4(mPartData.mStartColor);
+        sd["EndColor"] = ll_sd_from_color4(mPartData.mEndColor);
+        sd["StartScale"] = ll_sd_from_vector2(mPartData.mStartScale);
+        sd["EndScale"] = ll_sd_from_vector2(mPartData.mEndScale);
 
-        sd["ParticleMaxAge"] = mMaxAge;
-        sd["ParticleStartAge"] = mStartAge;
+        sd["SourceMaxAge"] = mMaxAge;
+        sd["SourceStartAge"] = mStartAge;
 
 
         sd["LL_PART_SRC_PATTERN_DROP"] = ( mPattern & LL_PART_SRC_PATTERN_DROP) ? 1 : 0;
@@ -406,14 +406,14 @@ bool LLPartSysData::fromLLSD(LLSD& sd)
         if (sd["LL_PART_EMISSIVE_MASK"])        mPartData.mFlags |= LLPartData::LL_PART_EMISSIVE_MASK;
         if (sd["LL_PART_BEAM_MASK"])            mPartData.mFlags |= LLPartData::LL_PART_BEAM_MASK;
 
-        mPartData.mMaxAge = (F32)sd["SourceMaxage"].asReal();
-        mPartData.mStartColor = ll_color4_from_sd(sd["Startcolor"]);
-        mPartData.mEndColor = ll_color4_from_sd(sd["Endcolor"]);
-        mPartData.mStartScale = ll_vector2_from_sd(sd["Startscale"]);
-        mPartData.mEndScale = ll_vector2_from_sd(sd["Endscale"]);
+        mPartData.mMaxAge = (F32)sd["ParticleMaxAge"].asReal();
+        mPartData.mStartColor = ll_color4_from_sd(sd["StartColor"]);
+        mPartData.mEndColor = ll_color4_from_sd(sd["EndColor"]);
+        mPartData.mStartScale = ll_vector2_from_sd(sd["StartScale"]);
+        mPartData.mEndScale = ll_vector2_from_sd(sd["EndScale"]);
 
-        mMaxAge         = (F32)sd["ParticleMaxAge"].asReal();
-        mStartAge       = (F32)sd["ParticleStartAge"].asReal();
+        mMaxAge         = (F32)sd["SourceMaxAge"].asReal();
+        mStartAge       = (F32)sd["SourceStartAge"].asReal();
 
         mPattern = 0;
         if (sd["LL_PART_SRC_PATTERN_DROP"])             mPattern |= LL_PART_SRC_PATTERN_DROP;
diff --git a/linden/indra/newview/app_settings/cloud.xml b/linden/indra/newview/app_settings/cloud.xml
index ff9492b..e62bcf1 100644
--- a/linden/indra/newview/app_settings/cloud.xml
+++ b/linden/indra/newview/app_settings/cloud.xml
@@ -1,33 +1,87 @@
 <llsd>
     <map>
+
+
+<!-- Settings for the whole particle system -->
+
+    <key>SourceMaxAge</key><!-- how long the source can live with 0 forever -->
+        <real>0</real>
+    <key>SourceStartAge</key>
+        <real>0</real>
+
     <key>AngularVelocity</key>
         <array>
             <real>0</real>
             <real>0</real>
             <real>0</real>
         </array>
+    <key>InnerAngle</key>
+        <real>3.1415927410125732421875</real>
+    <key>OuterAngle</key>
+        <real>0</real>
+
     <key>BurstPartCount</key>
         <integer>1</integer>
     <key>BurstRadius</key>
         <real>0.3</real>
     <key>BurstRate</key>
         <real>0.02</real>
+    <key>BurstSpeedMin</key>
+        <real>0.1</real>
     <key>BurstSpeedMax</key>
         <real>1</real>
-    <key>Endcolor</key>
+
+    <!-- pattern flags set to 1 for true and 0 for false -->
+    <key>LL_PART_SRC_PATTERN_ANGLE</key>
+        <integer>0</integer>
+    <key>LL_PART_SRC_PATTERN_ANGLE_CONE</key>
+        <integer>1</integer>
+    <key>LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY</key>
+        <integer>0</integer>
+    <key>LL_PART_SRC_PATTERN_DROP</key>
+        <integer>0</integer>
+    <key>LL_PART_SRC_PATTERN_EXPLODE</key>
+        <integer>0</integer>
+    <!-- end of pattern flags -->
+
+<!-- Settings for single particles within the  system -->
+
+    <key>ParticleMaxAge</key><!-- how long a single particle can live with 0 forever -->
+        <real>4</real>
+
+    <key>PartImageID</key> <!--This setting is ignored for the cloud, used instead for now is the hardcoded -->
+        <string>0000000000000-0000-0000-000000000000</string><!-- skins/default/textures/cloud-particle.j2c -->
+
+    <key>StartColor</key><!-- RGBA -->
+        <array>
+            <real>0.9</real>
+            <real>0.0</real>
+            <real>0.8</real>
+            <real>0.7</real>
+        </array>
+    <key>EndColor</key><!-- RGBA -->
         <array>
             <real>0.75</real>
             <real>0.47</real>
             <real>0.81</real>
             <real>0</real>
         </array>
-    <key>Endscale</key>
+
+    <key>StartScale</key>
+        <array>
+            <real>0.8</real>
+            <real>0.8</real>
+        </array>
+    <key>EndScale</key>
         <array>
             <real>0.02</real>
             <real>0.02</real>
         </array>
-    <key>InnerAngle</key>
-        <real>3.1415927410125732421875</real>
+
+    <key>TargetId</key><!-- This setting is ignored for the cloud -->
+        <string>00000000-0000-0000-0000-000000000000</string>
+
+    <!-- masks flags set to 1 for true and 0 for false-->
     <key>LL_PART_BEAM_MASK</key>
         <integer>0</integer>
     <key>LL_PART_BOUNCE_MASK</key>
@@ -42,47 +96,13 @@
         <integer>1</integer>
     <key>LL_PART_INTERP_SCALE_MASK</key>
         <integer>1</integer>
-    <key>LL_PART_SRC_PATTERN_ANGLE</key>
-        <integer>0</integer>
-    <key>LL_PART_SRC_PATTERN_ANGLE_CONE</key>
-        <integer>1</integer>
-    <key>LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY</key>
-        <integer>0</integer>
-    <key>LL_PART_SRC_PATTERN_DROP</key>
-        <integer>0</integer>
-    <key>LL_PART_SRC_PATTERN_EXPLODE</key>
-        <integer>0</integer>
     <key>LL_PART_TARGET_LINEAR_MASK</key>
         <integer>0</integer>
     <key>LL_PART_TARGET_POS_MASK</key>
         <integer>1</integer>
     <key>LL_PART_WIND_MASK</key>
         <integer>0</integer>
-    <key>OuterAngle</key>
-        <real>0</real>
-    <key>PartImageID</key>
-        <string>0000000000000-0000-0000-000000000000</string>
-    <key>ParticleMaxAge</key>
-        <real>0</real>
-    <key>ParticleStartAge</key>
-        <real>0</real>
-    <key>SourceMaxage</key>
-        <real>4</real>
-    <key>Startcolor</key>
-        <array>
-            <real>0.9</real>
-            <real>0.0</real>
-            <real>0.8</real>
-            <real>0.7</real>
-        </array>
-    <key>Startscale</key>
-        <array>
-            <real>0.8</real>
-            <real>0.8</real>
-        </array>
-    <key>TargetId</key>
-        <string>00000000-0000-0000-0000-000000000000</string>
-    <key>BurstSpeedMin</key>
-        <real>0.1</real>
+   <!-- end of mask flags -->
+
     </map>
 </llsd>
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 204357f..c0ddac5 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -1496,8 +1496,16 @@ LLPartSysData LLVOAvatar::sCloud;
 void LLVOAvatar::initCloud()
 {
         // fancy particle cloud designed by Brent
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "cloud.xml");
+        if(!gDirUtilp->fileExists(filename))
+        {
+                filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "cloud.xml");
+        }
+        if(!gDirUtilp->fileExists(filename))
+        {
+                filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
+        }
 
-        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
         LLSD cloud;
         llifstream in_file(filename);
         LLSDSerialize::fromXMLDocument(cloud, in_file);