10 files changed, 73 insertions, 36 deletions

diff --git a/linden/indra/llcommon/imageids.cpp b/linden/indra/llcommon/imageids.cpp
index 6b4fcd3..e5343fe 100644
--- a/linden/indra/llcommon/imageids.cpp
+++ b/linden/indra/llcommon/imageids.cpp
@@ -75,3 +75,5 @@ const LLUUID TERRAIN_MOUNTAIN_DETAIL	("303cd381-8560-7579-23f1-f0a880799740"); /
 const LLUUID TERRAIN_ROCK_DETAIL                ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER
 
 const LLUUID DEFAULT_WATER_NORMAL               ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
+
+const LLUUID DEFAULT_UNREZZED_AVATAR_PARTICLE   ("c6e07fda-aea5-4149-acb6-6f09980e0db5"); // VIEWER only
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h
index dc726dc..516fda1 100644
--- a/linden/indra/llcommon/imageids.h
+++ b/linden/indra/llcommon/imageids.h
@@ -72,4 +72,5 @@ LL_COMMON_API extern const LLUUID TERRAIN_ROCK_DETAIL;
 
 LL_COMMON_API extern const LLUUID DEFAULT_WATER_NORMAL;
 
+LL_COMMON_API extern const LLUUID DEFAULT_UNREZZED_AVATAR_PARTICLE;
 #endif
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index bdaf8cc..80eb65a 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -938,6 +938,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>PreviewAvatarAsCloud</key>
+  <map>
+    <key>Comment</key>
+    <string>Turns your avatar into the paricle clud if true</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>PrivateLookAtTarget</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index ad60694..f1b2428 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -119,7 +119,7 @@ BOOL LLPrefsAdvanced::postBuild()
         getChild<LLButton>("ac_button")->setClickedCallback(onAutoCorrectButton,this);
         initHelpBtn("EmeraldHelp_SpellCheck",           "EmeraldHelp_SpellCheck");
 
-
+        getChild<LLButton>("reset_cloud_this_account")->setClickedCallback(onResetThisCloudButton,this);
         getChild<LLButton>("save_cloud_this_account")->setClickedCallback(onSaveThisCloudButton,this);
         getChild<LLButton>("save_cloud_any_account")->setClickedCallback(onSaveAnyoneCloudButton,this);
 
@@ -214,8 +214,11 @@ void LLPrefsAdvanced::apply()
 
         LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
         gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex());
-
-        onSaveThisCloudButton(NULL);
+        
+        if (LLStartUp::isLoggedIn() && LLVOAvatar::sHasCloud)
+        {
+                onSaveThisCloudButton(NULL);
+        }
 }
 
 void LLPrefsAdvanced::cancel()
@@ -344,13 +347,15 @@ void LLPrefsAdvanced::draw()
 
 void LLPrefsAdvanced::setParticleControls(bool is_logged_in)
 {
-
+        childSetEnabled("reset_cloud_this_account", is_logged_in );
         childSetEnabled("save_cloud_this_account", is_logged_in);
         childSetEnabled("save_cloud_any_account", is_logged_in);
         childSetEnabled("part_start_color_swatch", is_logged_in);
         childSetEnabled("part_end_color_swatch", is_logged_in);
         childSetEnabled("part_texture_picker", is_logged_in );
 
+        childSetEnabled("preview_cloud", is_logged_in);
+        childSetVisible("preview_cloud", is_logged_in);
         childSetVisible("must_be_logged_in_textbox", !is_logged_in);
 }
 
@@ -419,6 +424,25 @@ void LLPrefsAdvanced::onClickCommandLine(void* data)
         FloaterCommandLine::getInstance()->center();
 }
 
+void LLPrefsAdvanced::onResetThisCloudButton(void * data)
+{
+        LLPrefsAdvanced* self = (LLPrefsAdvanced*)data;
+        if (!self)
+        {
+                return;
+        }
+
+        // keep draw() from overriding the cloud with the values from the UI
+        LLVOAvatar::sHasCloud = false; 
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
+        LLVOAvatar::loadCloud(filename, LLVOAvatar::sCloud);
+
+        // tell draw() to override values from the UI with the data from the new cloud
+        self-> mWasLoggedIn = !(LLStartUp::isLoggedIn());
+
+        LLVOAvatar::sHasCloud = true;
+}
+
 void LLPrefsAdvanced::onSaveThisCloudButton(void * data)
 {
         std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "cloud.xml");
diff --git a/linden/indra/newview/llprefsadvanced.h b/linden/indra/newview/llprefsadvanced.h
index 87ddc59..e4febcc 100644
--- a/linden/indra/newview/llprefsadvanced.h
+++ b/linden/indra/newview/llprefsadvanced.h
@@ -59,6 +59,7 @@ private:
         static void onSpellEditCustom(void* data);
         static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);  
         static void onAutoCorrectButton(void * data);
+        static void onResetThisCloudButton(void * data);
         static void onSaveThisCloudButton(void * data);
         static void onSaveAnyoneCloudButton(void * data);
 
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index e270dbb..c8adf7b 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -10724,19 +10724,6 @@ class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
         }
 };
 
-///////////////////////////////////
-// Reload Avatar Cloud Particles //
-///////////////////////////////////
-
-
-class LLAdvancedReloadAvatarCloudParticle : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVOAvatar::initCloud();
-                return true;
-        }
-};
 
 ///////////
 // Crash //
@@ -11526,7 +11513,6 @@ void initialize_menus()
         addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
         addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
         addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
-        addMenu(new LLAdvancedReloadAvatarCloudParticle(), "Advanced.ReloadAvatarCloudParticle");
 
         // Advanced > Crash
         addMenu(new LLAdvancedCrash(), "Advanced.Crash");
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d8b0994..8ddc936 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -1521,10 +1521,12 @@ void LLVOAvatar::loadCloud(const std::string& filename,  LLPartSysData& particle
         LLSDSerialize::fromXMLDocument(cloud, in_file);
 
         particles.fromLLSD(cloud);
-        if(particles.mPartImageID.isNull())
+        const LLUUID default_id = DEFAULT_UNREZZED_AVATAR_PARTICLE;
+        if(particles.mPartImageID.isNull() || default_id == particles.mPartImageID)
         {
-                LLViewerImage* cloud_image = gImageList.getImageFromFile("cloud-particle.j2c");
-                particles.mPartImageID                 = cloud_image->getID();
+                LLViewerImage* cloud_image =
+                        gImageList.getImageFromFile("cloud-particle.j2c", MIPMAP_YES, IMMEDIATE_YES, 0, 0, default_id);
+                particles.mPartImageID = default_id;
         }
 }
 
@@ -7431,6 +7433,7 @@ BOOL LLVOAvatar::isVisible()
 // returns true if the value has changed.
 BOOL LLVOAvatar::updateIsFullyLoaded()
 {
+
     // a "heuristic" to determine if we have enough avatar data to render
     // (to avoid rendering a "Ruth" - DEV-3168)
 
@@ -7510,11 +7513,19 @@ BOOL LLVOAvatar::updateIsFullyLoaded()
 
 BOOL LLVOAvatar::isFullyLoaded()
 {
+        static BOOL* sPreviewAvatarCloud = rebind_llcontrol<BOOL>("PreviewAvatarAsCloud", &gSavedSettings, true);
         static BOOL* sRenderUnloadedAvatar = rebind_llcontrol<BOOL>("RenderUnloadedAvatar", &gSavedSettings, true);
-        if (*sRenderUnloadedAvatar)
-                return TRUE;
-        else
-                return mFullyLoaded;
+
+        if(*sPreviewAvatarCloud && mIsSelf)
+        {
+                return FALSE;
+        }
+        else if (*sRenderUnloadedAvatar)
+        {
+                 return TRUE;
+        }
+
+        return mFullyLoaded;
 }
 
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index b31122a..d5b07c8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1992,13 +1992,6 @@
         <on_click function="Advanced.DumpAttachments"
                   userdata="" />
       </menu_item_call>
-      <menu_item_call
-              label="Reload Avatar Cloud Particle"
-              name="Reload Avatar Cloud Particle">
-                <on_click
-                 function="Advanced.ReloadAvatarCloudParticle"
-                 userdata="" />
-      </menu_item_call>
     </menu>
 
     <!-- CRASH -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml b/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml
index e5064dd..c1e1da9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml
@@ -9,7 +9,7 @@ left="1" mouse_opaque="true" name="ParticleSettings" width="418">
                 Start Color:
         </text>
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
-                can_apply_immediately="false" color="1 1 1 1"
+                can_apply_immediately="true" color="1 1 1 1"
                 enabled="true" follows="left|top" height="55" label="" left_delta="53"
                 mouse_opaque="true" name="part_start_color_swatch"
                 tool_tip="Click to open Color Picker" width="45" />
@@ -20,7 +20,7 @@ left="1" mouse_opaque="true" name="ParticleSettings" width="418">
                 End Color:
         </text>
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
-                can_apply_immediately="false" color="1 1 1 1"
+                can_apply_immediately="true" color="1 1 1 1"
                 enabled="true" follows="left|top" height="55" label="" left_delta="53"
                 mouse_opaque="true" name="part_end_color_swatch"
                 tool_tip="Click to open Color Picker" width="45" />
@@ -32,10 +32,13 @@ left="1" mouse_opaque="true" name="ParticleSettings" width="418">
         </text>
 
         <texture_picker  border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
-                can_apply_immediately="false" color="1 1 1 1"
+                can_apply_immediately="true" color="1 1 1 1"
                 enabled="true" follows="left|top" height="55" label="" left_delta="53"
                 mouse_opaque="true" name="part_texture_picker"
                 tool_tip="Click to open Texture Chooser" width="45" />
+        <button name="reset_cloud_this_account" label="reset for this account" halign="center"
+                tool_tip="reset the Avatar particle cloud to default for this account" left="12"
+                bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
         <button name="save_cloud_this_account" label="save for this account" halign="center"
                 tool_tip="save the Avatar particle cloud for this account" left="12"
                 bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 2d2b810..3b66fb8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -194,7 +194,12 @@ To use spellcheck, right-click a misspelled word
                 mouse_opaque="true" name="must_be_logged_in_textbox" v_pad="0" width="394">
                 You must be logged in to change this
         </text>
+        <check_box bottom_delta="-4" control_name="PreviewAvatarAsCloud" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16"
+             label="Preview avatar as cloud" left="10"
+             mouse_opaque="true" name="preview_cloud"
+             radio_style="false" tool_tip="Preview avatar as cloud when already rezzed"
+             width="80" />
     </panel>
-
   </tab_container>
 </panel>