fix: cached trees + grass white on opensim

issues remaining: windlight water is "flat"

3 files changed, 5 insertions, 4 deletions

diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index c56d676..e516aeb 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -108,7 +108,9 @@ void LLVOGrass::updateSpecies()
                 SpeciesMap::const_iterator it = sSpeciesTable.begin();
                 mSpecies = (*it).first;
         }
-        setTEImage(0, gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName));
+
+        mGrassImage = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName, TRUE, TRUE);
+        setTEImage(0, mGrassImage);
 }
 
 
@@ -162,7 +164,6 @@ void LLVOGrass::initClass()
 
                 GrassSpeciesData* newGrass = new GrassSpeciesData();
 
-
                 std::string textureName;
 
                 static LLStdStringHandle texture_name_string = LLXmlTree::addAttributeString("texture_name");
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index c55c59b..c05908b 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -128,7 +128,7 @@ private:
         void updateSpecies();
         F32 mLastHeight;                // For cheap update hack
         S32 mNumBlades;
-
+        LLPointer<LLViewerImage> mGrassImage;
         static SpeciesMap sSpeciesTable;
 };
 #endif // LL_VO_GRASS_
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 89d6491..53cfbdb 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -324,7 +324,7 @@ U32 LLVOTree::processUpdateMessage(LLMessageSystem *mesgsys,
         //
         //  Load Species-Specific data 
         //
-        mTreeImagep = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName);
+        mTreeImagep = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName, TRUE, TRUE);
         if (mTreeImagep)
         {
                 gGL.getTexUnit(0)->bind(mTreeImagep.get());