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

1 files changed, 9 insertions, 1 deletions

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);