fix default unloaded avatar cloud particle texture not loading

2 files changed, 8 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 039896f..de92903 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -193,6 +193,13 @@ void LLViewerImageList::doPreloadImages()
                 mImagePreloads.insert(image);
         }
 
+        // Preload default unrezzad avatar cloud
+        image = getImageFromFile("cloud-particle.j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,DEFAULT_UNREZZED_AVATAR_PARTICLE);
+        if (image)
+        {
+                image->setAddressMode(LLTexUnit::TAM_WRAP);
+                mImagePreloads.insert(image);
+        }
 }
 
 static std::string get_texture_list_name()
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3ba94fa..ded2230 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -1525,7 +1525,7 @@ void LLVOAvatar::loadCloud(const std::string& filename,  LLPartSysData& particle
         if(particles.mPartImageID.isNull() || default_id == particles.mPartImageID)
         {
                 LLViewerImage* cloud_image =
-                        gImageList.getImageFromFile("cloud-particle.j2c", MIPMAP_YES, IMMEDIATE_YES, 0, 0, default_id);
+                        gImageList.getImage(default_id);
                 particles.mPartImageID = cloud_image->getID();
         }
 }