From 994de98c7bf0461a5e1c1ea6aea517d9437ea4fd Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 20 Sep 2010 11:48:27 +0200
Subject: one more poke on trees+grass + fix the windlight water

---
 linden/indra/newview/llviewerimagelist.cpp | 2 +-
 linden/indra/newview/llvograss.cpp         | 9 +++++++--
 linden/indra/newview/llvograss.h           | 2 +-
 linden/indra/newview/llvotree.cpp          | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index f795de6..7642e80 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -156,7 +156,7 @@ void LLViewerImageList::doPreloadImages()
 		image->setAddressMode(LLTexUnit::TAM_WRAP);
 		mImagePreloads.insert(image);
 	}
-	image = getImage(DEFAULT_WATER_NORMAL, MIPMAP_YES, IMMEDIATE_YES);
+	image = getImageFromFile(DEFAULT_WATER_NORMAL.asString()+".j2c", MIPMAP_YES, IMMEDIATE_YES,0,0,DEFAULT_WATER_NORMAL);
 	if (image) 
 	{
 		image->setAddressMode(LLTexUnit::TAM_WRAP);	
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index e516aeb..8f4c0de 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -109,8 +109,8 @@ void LLVOGrass::updateSpecies()
 		mSpecies = (*it).first;
 	}
 
-	mGrassImage = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName, TRUE, TRUE);
-	setTEImage(0, mGrassImage);
+	LLViewerImage* grass_image = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName, TRUE, TRUE, 0, 0, sSpeciesTable[mSpecies]->mTextureID);
+	setTEImage(0, grass_image);
 }
 
 
@@ -170,6 +170,11 @@ void LLVOGrass::initClass()
 		success &= grass_def->getFastAttributeString(texture_name_string, textureName);
 		newGrass->mTextureName = textureName;
 
+		std::string textureID;
+		static LLStdStringHandle texture_id = LLXmlTree::addAttributeString("texture_id");
+		success &= grass_def->getFastAttributeString(texture_id, textureID);
+		newGrass->mTextureID = LLUUID(textureID);
+
 		static LLStdStringHandle blade_sizex_string = LLXmlTree::addAttributeString("blade_size_x");
 		success &= grass_def->getFastAttributeF32(blade_sizex_string, F32_val);
 		newGrass->mBladeSizeX = F32_val;
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index c05908b..86e4b95 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;
+// 	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 53cfbdb..fc38a5f 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, TRUE, TRUE);
+	mTreeImagep = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName, TRUE, TRUE, 0, 0, sSpeciesTable[mSpecies]->mTextureID);
 	if (mTreeImagep)
 	{
 		gGL.getTexUnit(0)->bind(mTreeImagep.get());
-- 
cgit v1.1